Merge branch 'test' of i3-IMPP/i3plus-pojo into ext-dev

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

@@ -207,6 +207,10 @@ public class MesWorkOrder extends BaseBean implements Serializable {
     @ApiParam(value = "乐观锁", example = "1")
     public Integer lockVersion;
 
+    @Column(name = "SORT_SEQ")
+    @ApiParam("排序序号")
+    private String sortSeq;
+
     /**********************  冗余字段 *********************************/
     @Transient
     @ApiParam(value = "工作中心名称")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ConditionQueryModel.java

@@ -25,10 +25,10 @@ public class ConditionQueryModel {
     private String customerPartNo;
 
     @ApiParam("开始时间")
-    private String modifyStartTime;
+    private String modifyStartDate;
 
     @ApiParam("结束时间")
-    private String modifyEndTime;
+    private String modifyEndDate;
 
     @ApiParam("零件二维码")
     private String serialNumber;