Jenkins自动合并

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java

@@ -38,6 +38,12 @@ public class ExportProject extends BaseAPS {
     @FieldAnnotation(relation = "Link", notEmpty = true)
     private Long linkId;
 
+    @ApiParam(value ="当前执行的明细序号")
+    private transient Integer curDetailNumber;
+
+    @ApiParam(value ="当前执行的明细名称")
+    private transient String curDetailName;
+
     public DataLink getLink() {
         return BeanRelation.get(this, EExportProject.Link);
     }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java

@@ -37,6 +37,12 @@ public class ImportProject extends BaseAPS {
     @FieldAnnotation(relation = "Link", notEmpty = true)
     private Long linkId;
 
+    @ApiParam(value ="当前执行的明细序号")
+    private transient Integer curDetailNumber;
+
+    @ApiParam(value ="当前执行的明细名称")
+    private transient String curDetailName;
+
     public DataLink getLink() {
         return BeanRelation.get(this, EImportProject.Link);
     }

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

@@ -12,5 +12,5 @@ import lombok.Data;
 @Data
 public class RuleGroupProgress {
     private String message;
-    private String progress;
+    private Long progress;
 }