Merge branch 'master' of http://47.95.120.53:8083/r/JC34WMS

hwh

2025-02-18 d14ca5fe3519ff0cf4cfff19242fca4754b34a43

 HTML/views/WareHouseSetting/Locate.html

@@ -131,9 +131,11 @@
         <div class="layui-card-body">
            <table id="LAY-app-content-list" lay-filter="LAY-app-content-list" style="width: 100%;"></table>
            <script type="text/html" id="table-content-list">
               {{# if(d.Make=="1"){ }}
                  <a class="editBtn layui-btn layui-btn-normal layui-btn-xs editClass" lay-event="edit">
                     <i class="layui-icon layui-icon-edit"></i>编辑</a>
               </script>
                  <i class="layui-icon layui-icon-edit"></i>编辑</a>
               {{# }  }}
            </script>
         </div>
      </div>
   </div>
@@ -448,6 +450,11 @@
                  align: 'center',
                  width: 90,
               }, {
                  field: 'MakeName',
                  title: '类型标识',
                  align: 'center',
                  width: 90,
               }, {
                  field: 'Row',
                  title: '排',
                  align: 'center',