From 438f6e296190bbd746637cb436346807e762717b Mon Sep 17 00:00:00 2001
From: XLR_asd <xueyawei@seaskysh.com>
Date: Mon, 12 Jul 2021 09:21:45 +0800
Subject: [PATCH 1/2] =?UTF-8?q?style=20=20=E7=94=B3=E6=8A=A5=E4=B9=A6=20?=
 =?UTF-8?q?=20=E9=83=A8=E5=88=86Q=E7=BA=BF=E6=8E=A5=E5=8F=A3=20=E6=8F=8F?=
 =?UTF-8?q?=E8=BF=B0=E9=94=99=E8=AF=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../interfaces/controller/ProjectPlanController.java          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/ProjectPlanController.java b/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/ProjectPlanController.java
index a789b72a7..b387816de 100644
--- a/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/ProjectPlanController.java
+++ b/ServiceSite/src/main/java/com/seasky/projectplan/interfaces/controller/ProjectPlanController.java
@@ -158,13 +158,13 @@ public class ProjectPlanController extends BaseController implements IProjectPla
     }
 
 
-    @ApiOperation("Q9.鏍规嵁褰撳墠鐧诲綍浜烘墍鍦ㄩ儴闂ㄩ泦鍚堣幏鍙栭」鐩粡璐归泦鍚堬紙鍒嗛〉锛�")
+    @ApiOperation("Q9.鑾峰彇椤圭洰缁忚垂鐢虫姤涔﹂泦鍚堬紙鍒嗛〉锛�")
     @Override
     public Result<ProjectPlanBookOut> queryProjectInfoPlanPage(@RequestBody ProjectInfoPlanQry projectInfoPlanQry) {
         return ok(ResponseCode.SUCCESS, queryService.queryProjectInfoPlanPage(projectInfoPlanQry));
     }
 
-    @ApiOperation("Q10.鏍规嵁褰撳墠鐧诲綍浜烘墍鍦ㄩ儴闂ㄩ泦鍚堣幏鍙栨棩甯哥粡璐归泦鍚堬紙鍒嗛〉锛�")
+    @ApiOperation("Q10.鑾峰彇鏃ュ父缁忚垂鐢虫姤涔﹂泦鍚堬紙鍒嗛〉锛�")
     @Override
     public Result<ProjectPlanBookOut> queryProjectDailyPlan(@RequestBody ProjectDailyPlanQry projectDailyPlanQry) {
         return ok(ResponseCode.SUCCESS, queryService.queryProjectDailyPlan(projectDailyPlanQry));
-- 
GitLab


From 0664dafb02f4036ab0cbb91aaf06f944889bf307 Mon Sep 17 00:00:00 2001
From: XLR_asd <xueyawei@seaskysh.com>
Date: Mon, 12 Jul 2021 09:34:26 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix=20=20=E7=94=B3=E6=8A=A5=E4=B9=A6Q?=
 =?UTF-8?q?=E7=BA=BF=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=E6=80=BB=E9=87=91?=
 =?UTF-8?q?=E9=A2=9D=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../seasky/projectplan/dto/projectplan/ProjectPlanBookOut.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/projectplan/ProjectPlanBookOut.java b/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/projectplan/ProjectPlanBookOut.java
index 8931a7fc6..dbed871ed 100644
--- a/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/projectplan/ProjectPlanBookOut.java
+++ b/ServiceSite/facade/src/main/java/com/seasky/projectplan/dto/projectplan/ProjectPlanBookOut.java
@@ -82,6 +82,9 @@ public class ProjectPlanBookOut extends BaseDto implements Serializable {
 //    @ApiModelProperty(value = "缁忔祹绉戠洰闆嗗悎",example = "")
 //    private List<PlanSubjectCmd> planSubjectList;
 
+    @ApiModelProperty(value = "鐢虫姤閲戦",example = "")
+    private BigDecimal totalMoney;
+    
     @ApiModelProperty(value = "鏍稿畾閲戦2",example = "")
     private BigDecimal quotaMoney2;
 
-- 
GitLab