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 | 7 ++++++-
1 files changed, 6 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 2536961..920c4c6 100644
--- a/business/src/main/java/com/ycl/domain/vo/ProgressReportResponseVO.java
+++ b/business/src/main/java/com/ycl/domain/vo/ProgressReportResponseVO.java
@@ -1,11 +1,14 @@
package com.ycl.domain.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ycl.domain.entity.File;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.math.BigDecimal;
import java.util.Date;
+import java.util.List;
@Data
@AllArgsConstructor
@@ -20,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;
@@ -32,5 +36,6 @@
private Integer manageExamine;
private String manageApproval;
private String manageApprovalReply;
+ private List<File> fileList;
}
--
Gitblit v1.8.0