Merge branch 'dev' into test

2 years ago · c9eb7079a2
parent a3b551a2b0 e4ed256783
commit c9eb7079a2
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
@ -398,7 +398,7 @@
                    column="code" select="com.glxp.api.dao.auth.WarehouseBussinessTypeDao.selectListByAction"/>
    </resultMap>

-    <select id="selectInvListTreeByUser" resultType="com.glxp.api.vo.inv.InvWarehouseTreeVo">
+    <select id="selectInvListTreeByUser" resultMap="selectInvListTreeByUser">
        select auth_warehouse.code,
               auth_warehouse.name,
               auth_warehouse.parentId,