Merge branch 'dev' into test

src/main/java/com/glxp/api/entity/auth/InvWarehouseEntity.java

@@ -20,7 +20,7 @@ public class InvWarehouseEntity {
     /**
      * 仓库编码
      */
-    @TableField(value = "code")
+    @TableField(value = "`code`")
     private String code;
 
     /**

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

@@ -394,12 +394,13 @@
     </select>
     
     <resultMap id="selectInvListTreeByUser" type="com.glxp.api.vo.inv.InvWarehouseTreeVo" autoMapping="true">
+        <result column="code" property="code"></result>
         <collection property="bussinessTypeList" autoMapping="true" ofType="com.glxp.api.entity.auth.WarehouseBussinessTypeEntity"
                     column="code" select="com.glxp.api.dao.auth.WarehouseBussinessTypeDao.selectListByAction"/>
     </resultMap>
 
     <select id="selectInvListTreeByUser" resultMap="selectInvListTreeByUser">
-        select auth_warehouse.code,
+        select auth_warehouse.`code`,
                auth_warehouse.name,
                auth_warehouse.parentId,
                auth_warehouse.parentCode,