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

2 years ago · 8e33768fb8
parent b78a5a35c3 7bdaf137b6
commit 8e33768fb8
1 changed files with 7 additions and 8 deletions
--- a/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml
+++ b/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml
@ -408,11 +408,10 @@

    <select id="selectInvListTreeByUser" resultMap="selectInvListTreeByUser">
        select auth_warehouse.`code`,
-               auth_warehouse.name warehouseName,
+        auth_warehouse.name,
        auth_warehouse.parentId,
        auth_warehouse.parentCode,
-               auth_dept.code deptCode,
-               auth_dept.name deptName,
+        auth_dept.name warehouseName,
        auth_warehouse.advanceType
        from auth_warehouse
        inner join auth_dept on auth_warehouse.parentId = auth_dept.code