From 310f2ec1d4bc58a911701ba0b902f27a3e17efb6 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期五, 03 一月 2025 16:43:33 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- business/src/main/java/com/ycl/domain/vo/ProjectPlanResponseVO.java | 10 ++++++---- 1 files changed, 6 insertions(+), 4 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 b12c748..21a51d1 100644 --- a/business/src/main/java/com/ycl/domain/vo/ProjectPlanResponseVO.java +++ b/business/src/main/java/com/ycl/domain/vo/ProjectPlanResponseVO.java @@ -12,11 +12,13 @@ private String projectName; private Integer reportStatus; private String projectCode; - private Integer projectType; - private Integer projectPhase; + private String projectType; + private String projectPhase; private Integer monthStatus; private Integer seasonStatus; private Integer yearStatus; - private Integer projectStatus; - private Integer investType; + private String projectStatus; + private String investType; + private String projectColorCode; + private Integer exception; } -- Gitblit v1.8.0