Merge branch 'dev' into test

2 years ago · fe542451cf
parent a3c4521c16 7816c44344
commit fe542451cf
1 changed files with 1 additions and 1 deletions
--- a/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml
+++ b/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml
@ -408,7 +408,7 @@
    <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,