Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

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

@@ -197,7 +197,7 @@ public class QueueOrderModel implements Serializable {
         this.orderNo = orderNo;
     }
 
-    public QueueOrderModel(String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
+    public QueueOrderModel(String serialNumber,String orderNo, Long id, Double queueSeq, Double queDetailSeq, String custFlagNo, String prodCfgNameRdd, String categoryNameRdd,
                            String partNo, String partNameRdd, String workType) {
         this.id = id;
         this.queueSeq = queueSeq;
@@ -209,5 +209,6 @@ public class QueueOrderModel implements Serializable {
         this.partNameRdd = partNameRdd;
         this.workType = workType;
         this.orderNo = orderNo;
+        this.serialNumber=serialNumber;
     }
 }

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

@@ -113,6 +113,8 @@ public class StationRequestBean implements Serializable {
     @ApiParam("展示组件")
     private Object moduleService;
 
+    @ApiParam("工步序号")
+    private  Integer stepSeq;
     @Override
     public String toString() {
         return "StationRequestBean{" +