From f47844c608afc6f5e21d882061cf1ca3a10d6301 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 26 四月 2024 13:44:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateReportVO.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateReportVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateReportVO.java
index 6252ece..7560cef 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateReportVO.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateReportVO.java
@@ -6,6 +6,8 @@
import java.math.BigDecimal;
import java.util.List;
import java.time.LocalDateTime;
+
+import com.ycl.platform.domain.form.CalculateRecordForm;
import org.springframework.lang.NonNull;
import org.springframework.beans.BeanUtils;
import io.swagger.annotations.ApiModel;
@@ -20,11 +22,16 @@
* @since 2024-04-23
*/
@Data
-@Accessors(chain = true)
public class CalculateReportVO extends AbsVo {
/** 鍚堝悓 */
private Integer contractId;
+
+ /** 杩愮淮鍗曚綅 */
+ private String unitName;
+
+ /** 鍚堝悓鍚嶇О */
+ private String contractName;
/** 鏍哥畻鏃ユ湡 */
private LocalDateTime calculateTime;
@@ -39,7 +46,10 @@
private Integer whichMonth;
/** 淇敼浜� */
- private Long updateBy;
+ private String updateBy;
+
+ /** 鏄庣粏 */
+ private List<CalculateRecordVO> recordList;
public static CalculateReportVO getVoByEntity(@NonNull CalculateReport entity, CalculateReportVO vo) {
if(vo == null) {
--
Gitblit v1.8.0