Merge branch 'master' of gitee.com:doc_wei01_admin/erp-pro

erp-web/src/main/resources/dbmapper/erp/StoreHouseMapper.xml

@@ -56,27 +56,27 @@
             <if test="principal != '' and principal != null">
                 principal,
             </if>
-        tenant_id,
-        is_default,
-        create_time
+	        tenant_id,
+	        is_default,
+	        create_time
         )VALUES(
-        #{id},
-        #{name},
-        <if test="address != '' and address != null">#{address},
-        </if>
-            <if test="
-        warehousing != '' and warehousing != null">
-                #{warehousing},
-            </if>
-            <if test="truckage != '' and truckage != null">
-                #{truckage},
-            </if>
-            <if test="remark != '' and remark != null">
-                #{remark},
-            </if>
-            <if test="principal != '' and principal != null">
-                #{principal},
-            </if>
+	        #{id},
+	        #{name},
+	        <if test="address != '' and address != null">
+	        	#{address},
+	        </if>
+	           <if test="warehousing != '' and warehousing != null">
+	               #{warehousing},
+	           </if>
+	           <if test="truckage != '' and truckage != null">
+	               #{truckage},
+	           </if>
+	           <if test="remark != '' and remark != null">
+	               #{remark},
+	           </if>
+	           <if test="principal != '' and principal != null">
+	               #{principal},
+	           </if>
 	        #{userId},
 	        #{isDefault},
 	        #{createTime}

erp-web/src/main/resources/template/js/storehouse/storehouselist.js

@@ -70,7 +70,7 @@ layui.config({
         rowId = data.id;
         _openNewWindows({
             url: "../../tpl/storehouse/storehouseedit.html",
-            title: "编辑用户",
+            title: "编辑仓库",
             pageId: "storehouseedit",
             area: ['90vw', '90vh'],
             callBack: function(refreshCode){

erp-web/src/main/resources/template/tpl/storehouse/storehouselist.html

@@ -16,6 +16,7 @@
                 <div class="layui-input-inline">
                     <input type="text" id="houseName" name="houseName" placeholder="请输入仓库名称" class="layui-input" />
                 </div>
+                <button type="reset" class="layui-btn layui-btn-primary list-form-search">重置</button>
                 <button class="layui-btn list-form-search" lay-submit lay-filter="formSearch">搜索</button>
             </div>
         </div>