From 2330e34c1d0f8a3c58a729eaee8e9987f612d83d Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期四, 12 十二月 2024 10:51:27 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- business/src/main/java/com/ycl/domain/vo/ProjectPlanResponseVO.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/business/src/main/java/com/ycl/domain/vo/ProjectPlanResponseVO.java b/business/src/main/java/com/ycl/domain/vo/ProjectPlanResponseVO.java index e5ed1df..038caec 100644 --- a/business/src/main/java/com/ycl/domain/vo/ProjectPlanResponseVO.java +++ b/business/src/main/java/com/ycl/domain/vo/ProjectPlanResponseVO.java @@ -13,10 +13,11 @@ private Integer reportStatus; private String projectCode; private String projectType; - private Integer projectPhase; + private String projectPhase; private Integer monthStatus; private Integer seasonStatus; private Integer yearStatus; private String projectStatus; private String investType; + private String projectColorCode; } -- Gitblit v1.8.0