From 6f094df5ca2b3fd83f6c2c64c72dd177756d4601 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 06 十二月 2024 14:04:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/domain/vo/ProgressReportResponseVO.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/business/src/main/java/com/ycl/domain/vo/ProgressReportResponseVO.java b/business/src/main/java/com/ycl/domain/vo/ProgressReportResponseVO.java
index dfa3ff4..920c4c6 100644
--- a/business/src/main/java/com/ycl/domain/vo/ProgressReportResponseVO.java
+++ b/business/src/main/java/com/ycl/domain/vo/ProgressReportResponseVO.java
@@ -23,11 +23,12 @@
private Integer planTime;
private Integer PlanTimeFlag;
private String title;
+ private Integer progressStatusInt;
private Date startTime;
private Date endTime;
private Date actualStartTime;
private Date actualEndTime;
- private String progressStatus;
+ private String progressStatusStr;
private BigDecimal actualInvest;
private Integer departmentExamine;
private String departmentApproval;
--
Gitblit v1.8.0