Jenkins自动合并

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

@@ -6,5 +6,6 @@ import lombok.Data;
 public class GanttDragModel {
     private Long workId;
     private Long resId;
+    private Long targetResId;
     private Long targetWorkId;
 }

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

@@ -19,9 +19,9 @@ public class GanttPlanModel {
     @JsonDeserialize(using = CustomDateDeserializer.class)
     private Date endDate;
     private String cls;
-    //private String timeRangeColor;
     private String eventColor;
     private String name;
     private Long workId;
     private List<Long> resIds;
+    private Boolean draggable;
 }