Merge branch 'dev' into test

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttOrderModel.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class GanttOrderModel {
+    private Long id;
+    private String code;
+    private String name;
+    private List<GanttOrderModel> children = new ArrayList<>();
+}

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

@@ -80,7 +80,8 @@ public class MesQcCheckStandard extends BaseBean {
     public MesQcCheckStandard() {
     }
 
-    public MesQcCheckStandard(String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard, String checkGuide, String checkFrequency, String partName, String checkItemType) {
+    public MesQcCheckStandard(Long id, String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard, String checkGuide, String checkFrequency, String partName, String checkItemType) {
+        this.id = id;
         this.partNo = partNo;
         this.workCenterCode = workCenterCode;
         this.workCellCode = workCellCode;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java

@@ -64,4 +64,10 @@ public class WmsTmsShipDto extends BaseDto implements Serializable {
 
     @ApiParam("关联单号")
     private String refOrderNo;
+
+    @ApiParam("开始时间")
+    private String createDateTimeStart;
+
+    @ApiParam("结束时间")
+    private String createDateTimeEnd;
 }