From ec1d0a35406ab0a036adc97820d0008a23ec826c Mon Sep 17 00:00:00 2001
From: Jason <jason.niu@estsh.com>
Date: Tue, 18 Jan 2022 10:37:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E6=8B=86=E5=88=86=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6=E7=9A=84=E5=B7=A5=E4=BD=9C=E4=B8=8D=E5=90=8C=E9=A2=9C?=
 =?UTF-8?q?=E8=89=B2=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java            | 5 +++++
 .../src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java | 1 +
 2 files changed, 6 insertions(+)

diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java
index 1ab6cb3..74c48cd 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java
@@ -184,6 +184,11 @@ public class Work extends BaseAPS {
     @FieldAnnotation(property = false)
     private Long mouldId = 0L;
 
+    @Column(name="FEEDBACK_SPLIT")
+    @ApiParam(value ="是否报工拆分")
+    @FieldAnnotation(modify = false)
+    private Boolean feedbackSplit;
+
     // 排程时，找插入位置的评估值
     private transient double evaluateValue = 0;
 
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 0223427..b09259b 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
@@ -27,6 +27,7 @@ public class GanttPlanModel {
     private Date endDate;
     private String cls;
     private String eventColor;
+    private String style;
     private String name;
     private Long workId;
     private List<Long> resIds;