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

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

@@ -12,7 +12,6 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * @Description:散件零件生产配置
@@ -133,11 +132,11 @@ public class MesScatterPartProdCfg extends BaseBean implements Serializable {
 
     @Column(name = "EFF_START_TIME")
     @ApiParam("有效起始日期")
-    private Date effStartTime;
+    private String effStartTime;
 
     @Column(name = "EFF_END_TIME")
     @ApiParam("有效截至日期")
-    private Date effEndTime;
+    private String effEndTime;
 
     @Column(name = "PROD_CFG_TYPE_CODE")
     @ApiParam("项目代码")