Jenkins自动合并

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

@@ -1,7 +1,6 @@
 package cn.estsh.i3plus.pojo.model.mes;
 
 
-
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
@@ -71,6 +70,10 @@ public class StationRequestBean implements Serializable {
     @ApiParam("托盘号")
     private String tray;
 
+    @ApiParam("完成数量")
+    private Integer finishCount;
+
     @ApiParam("工步列表")
     private List<StepModel> stepList;
+
 }