From 3a72ed0e746065fa5cd454fda581ef0711925eb2 Mon Sep 17 00:00:00 2001
From: chenhao <852066789@qq.com>
Date: Fri, 20 Dec 2024 14:24:42 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat(Project):=20=E6=B7=BB=E5=8A=A0=20resol?=
 =?UTF-8?q?vePlanSynergy=20=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 Project 类中新增 resolvePlanSynergy 属性，类型为 Boolean
- 添加相应的 getter 和 setter 方法
- 该字段用于表示解决计划是否协同
---
 src/main/java/cn/palmte/work/model/Project.java | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/main/java/cn/palmte/work/model/Project.java b/src/main/java/cn/palmte/work/model/Project.java
index efb0b16..1a4a2f4 100644
--- a/src/main/java/cn/palmte/work/model/Project.java
+++ b/src/main/java/cn/palmte/work/model/Project.java
@@ -252,6 +252,8 @@ public class Project {
 
     @Column(name = "resolve_plan")
     private Integer resolvePlan;
+    @Column(name = "resolve_plan_synergy")
+    private Boolean resolvePlanSynergy;
 
     @Column(name = "resolve_plan_str")
     private String resolvePlanStr;
@@ -376,6 +378,15 @@ public class Project {
     @Transient
     private String bidsTimeStr;
 
+
+    public Boolean getResolvePlanSynergy() {
+        return resolvePlanSynergy;
+    }
+
+    public void setResolvePlanSynergy(Boolean resolvePlanSynergy) {
+        this.resolvePlanSynergy = resolvePlanSynergy;
+    }
+
     public int getId() {
         return id;
     }

From 203fc9b2adde52c7eac7588e0a6c6e672bcb0aed Mon Sep 17 00:00:00 2001
From: chenhao <852066789@qq.com>
Date: Fri, 20 Dec 2024 14:26:06 +0800
Subject: [PATCH 2/2] =?UTF-8?q?refactor(Project):=20=E7=A7=BB=E9=99=A4=20P?=
 =?UTF-8?q?roject=20=E7=B1=BB=E4=B8=AD=E6=9C=AA=E4=BD=BF=E7=94=A8=E7=9A=84?=
 =?UTF-8?q?=20resolvePlanSynergy=20=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 删除了 Project 类中的 resolvePlanSynergy 属性- 移除了相关的 getter 和 setter 方法
---
 src/main/java/cn/palmte/work/model/Project.java | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/main/java/cn/palmte/work/model/Project.java b/src/main/java/cn/palmte/work/model/Project.java
index 1a4a2f4..ebc1b08 100644
--- a/src/main/java/cn/palmte/work/model/Project.java
+++ b/src/main/java/cn/palmte/work/model/Project.java
@@ -252,8 +252,6 @@ public class Project {
 
     @Column(name = "resolve_plan")
     private Integer resolvePlan;
-    @Column(name = "resolve_plan_synergy")
-    private Boolean resolvePlanSynergy;
 
     @Column(name = "resolve_plan_str")
     private String resolvePlanStr;
@@ -379,13 +377,7 @@ public class Project {
     private String bidsTimeStr;
 
 
-    public Boolean getResolvePlanSynergy() {
-        return resolvePlanSynergy;
-    }
 
-    public void setResolvePlanSynergy(Boolean resolvePlanSynergy) {
-        this.resolvePlanSynergy = resolvePlanSynergy;
-    }
 
     public int getId() {
         return id;