Merge branch 'dev' into test

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

@@ -6,7 +6,7 @@ import lombok.Data;
 import java.io.Serializable;
 
 @Data
-public class MesEquTaskModel implements Serializable {
+public class QueueJisModel implements Serializable {
     @ApiParam("id")
     private Long id;
 
@@ -74,11 +74,11 @@ public class MesEquTaskModel implements Serializable {
     private MesButtonFlagModel mesButtonFlagModel;
 
 
-    public MesEquTaskModel() {
+    public QueueJisModel() {
 
     }
 
-    public MesEquTaskModel(Long id, String taskNo, Integer taskType, Integer taskStatus, String workCenterCode, String planTime, Integer taskSource, String memo, Integer notifyFlag, String relateTask, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
+    public QueueJisModel(Long id, String taskNo, Integer taskType, Integer taskStatus, String workCenterCode, String planTime, Integer taskSource, String memo, Integer notifyFlag, String relateTask, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
         this.id = id;
         this.taskNo = taskNo;
         this.taskType = taskType;