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

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardLine.java

@@ -48,7 +48,7 @@ public class MesBoardLine extends BaseBean implements Serializable {
 
     @Column(name = "PLAN_TAKT")
     @ApiParam("计划节拍")
-    private Integer planTakt;
+    private Double planTakt;
 
     @Column(name = "PASS_PERCENT_MAX")
     @ApiParam("良品率上限")
@@ -60,7 +60,7 @@ public class MesBoardLine extends BaseBean implements Serializable {
 
     @Column(name = "CAR_RUN_TIME")
     @ApiParam("小车运行时间（分）")
-    private Integer carRunTime;
+    private Double carRunTime;
 
     @Column(name = "TEST_CAR_SUM")
     @ApiParam("调试车数")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataRecord.java

@@ -80,8 +80,9 @@ public class WmsInterfaceDataRecord extends BaseBean {
     @Column(name = "ERP_DOC_NO")
     private String erpDocNo;
 
+    // 必须有默认值
     @ApiParam("ERP状态代码")
-    @Column(name = "ERP_STATUS_CODE")
+    @Column(name = "ERP_STATUS_CODE", columnDefinition = "varchar(225) default ''")
     private String erpStatusCode;
 
     @ApiParam("ERP状态描述")