Merge branch 'dev' into test

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

@@ -137,7 +137,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/inout/IoAddInoutService.java

@@ -769,7 +769,7 @@ public class IoAddInoutService {
                         List<IoCodeTempEntity> ioCodeEnttities = new ArrayList<>();
                         for (int index = 0; index < pdaCodeEntities.size(); index++) {
                             IoCodeTempEntity codeEnttity = new IoCodeTempEntity();
-                            BeanUtils.copyProperties(pdaCodeEntities.get(index), codeEnttity);
+                            BeanUtil.copyProperties(pdaCodeEntities.get(index), codeEnttity);
                             codeEnttity.setAction(orderSaveRequest.getAction());
                             codeEnttity.setMainAction(orderSaveRequest.getMainAction());
                             codeEnttity.setDeptCode(orderSaveRequest.getDeptCode());