Merge remote-tracking branch 'origin/dev' into dev

src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml

@@ -408,15 +408,14 @@
 
     <select id="selectInvListTreeByUser" resultMap="selectInvListTreeByUser">
         select auth_warehouse.`code`,
-               auth_warehouse.name warehouseName,
+        auth_warehouse.name,
-               auth_warehouse.parentId,
+        auth_warehouse.parentId,
-               auth_warehouse.parentCode,
+        auth_warehouse.parentCode,
-               auth_dept.code deptCode,
+        auth_dept.name warehouseName,
-               auth_dept.name deptName,
+        auth_warehouse.advanceType
-               auth_warehouse.advanceType
         from auth_warehouse
-                     inner join auth_dept on auth_warehouse.parentId = auth_dept.code
+        inner join auth_dept on auth_warehouse.parentId = auth_dept.code
-                     LEFT join auth_warehouse_user on auth_warehouse.code = auth_warehouse_user.code
+        LEFT join auth_warehouse_user on auth_warehouse.code = auth_warehouse_user.code
         <where>
             <if test="userId != null">
                 AND auth_warehouse_user.userId = #{userId}