Merge branch 'dev' into test

2 years ago · 96db2c7404
parent fe542451cf 7bdaf137b6
commit 96db2c7404
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
@ -411,8 +411,7 @@
        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