From 0bd75ba2fe56d4b5fe8f647fa59ca135664ce450 Mon Sep 17 00:00:00 2001
From: Jason <jason.niu@estsh.com>
Date: Sat, 31 Jul 2021 15:38:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9C=AA=E5=AE=8C=E5=85=A8?=
 =?UTF-8?q?=E4=B8=8B=E5=8F=91=E6=9C=80=E5=A4=A7=E9=97=B4=E9=9A=94=E9=99=90?=
 =?UTF-8?q?=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java        | 4 ++++
 .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResGanttTable.java   | 5 +++++
 .../src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java | 1 +
 3 files changed, 10 insertions(+)

diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java
index 83c965a..bef6a1c 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java
+++ b/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;
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResGanttTable.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResGanttTable.java
index dd14d5b..e40a718 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResGanttTable.java
+++ b/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;
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java
index 4254fba..6e2e3bb 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java
+++ b/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;
 }