From cea2ecb470537a52e6a17d09703a9f770b220cdf Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期四, 05 十二月 2024 17:08:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/domain/vo/ProgressReportResponseVO.java | 11 ++++++++++-
1 files changed, 10 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 241086e..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
@@ -13,14 +16,19 @@
public class ProgressReportResponseVO {
// 璁″垝椤筰d
private Integer id;
+ // 杩涘害涓婃姤id
+ private Integer progressReportId;
+ // 瀹℃牳璁板綍id
+ private Integer examineRecordId;
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;
@@ -28,5 +36,6 @@
private Integer manageExamine;
private String manageApproval;
private String manageApprovalReply;
+ private List<File> fileList;
}
--
Gitblit v1.8.0