Merge branch 'dev' into test

src/main/java/com/glxp/api/entity/inout/IoCodeTempEntity.java

@@ -136,7 +136,7 @@ public class IoCodeTempEntity {
     private Date createTime;
 
     @TableField(exist = false)
-    private int status;     //条码校验状态
+    private Integer status;     //条码校验状态
     @TableField(exist = false)
     private String mySupId;     //更新供应商
 

src/main/java/com/glxp/api/service/basic/BasicBackUpdateProductService.java

@@ -242,6 +242,7 @@ public class BasicBackUpdateProductService {
                         udiRelevanceEntity1.setThirdId(thrProductsEntity.getCode());
                         udiRelevanceEntity1.setUpdateTime(new Date());
                         udiRelevanceEntity1.setModifyTime(new Date());
+                        udiRelevanceEntity1.setId(gennerOrderUtils.getRelId());
                         udiRelevanceService.insertUdiRelevanceignore(udiRelevanceEntity1);
                     }
                 }