Merge remote-tracking branch 'origin/ext-dev' into ext-dev

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

@@ -46,4 +46,8 @@ public class DayShift extends BaseAPS {
     @FieldAnnotation(notEmpty = true)
     @ShiftTimeAnnotation(groups = {InsertGroup.class, UpdateGroup.class, ImportGroup.class})
     private String workTimes;
+
+    @Column(name="COLOR")
+    @ApiParam(value ="颜色")
+    private String color;
 }

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

@@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.aps.bean;
 
 import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
+import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -45,6 +46,10 @@ public class ResGanttTable extends BaseAPS {
     @ApiParam(value ="序号")
     private Integer orderNumber;
 
+    private transient ApsEnumUtil.FIELD_TYPE type;
+
+    private transient ApsEnumUtil.EDIT_TYPE editType;
+
     @ApiParam(value ="枚举项内容")
     private transient Enum<?>[] enumItems;
 }

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

@@ -24,4 +24,5 @@ public class GanttPlanModel {
     private Long workId;
     private List<Long> resIds;
     private Boolean draggable;
+    private Boolean furnacePlan = false;
 }