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

src/main/java/com/glxp/api/controller/inout/IoOrderController.java

@@ -241,7 +241,7 @@ public class IoOrderController extends BaseController {
             return ResultVOUtils.error(500, "单据未扫码或扫码校验无法通过,提交失败,请检查后重新提交！");
         }
         IoOrderEntity orderEntity = orderService.findByBillNo(addOrderRequest.getBillNo());
-
+        orderEntity.setRemark(addOrderRequest.getRemark());
         BaseResponse tempResponse = checkSubmitEnable(orderEntity);
         if (tempResponse != null)
             return tempResponse;

src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java

@@ -123,7 +123,7 @@ public class UdiRelevanceResponse {
     private String syqsfxyjxmj;
     private String mjfs;
     private String categoryName;
-    private int count;
+    private Integer count;
     private Long deId;
 
 

src/main/java/com/glxp/api/res/inout/IoCodeTempResponse.java

@@ -120,5 +120,7 @@ public class IoCodeTempResponse {
      * 供应商名称
      */
     private String supName;
+    private String remark;
+
 
 }

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

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.auth.SysMenuDao">
 
-    <resultMap type="com.glxp.api.entity.auth.SysMenu" id="SysMenuResult">
+    <resultMap autoMapping="true" type="com.glxp.api.entity.auth.SysMenu" id="SysMenuResult">
         <id property="menuId" column="menu_id"/>
         <result property="menuName" column="menu_name"/>
         <result property="parentName" column="parent_name"/>