From cd24a045bd9ee29505ddc9760d25f5d4037f4f0c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 05 九月 2024 21:55:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateReportVO.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 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 d770ebb..ea5e790 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
@@ -7,6 +7,7 @@
 import java.util.List;
 import java.time.LocalDateTime;
 
+import enumeration.general.CalculateReportStatusEnum;
 import org.springframework.lang.NonNull;
 import org.springframework.beans.BeanUtils;
 import lombok.Data;
@@ -41,6 +42,14 @@
     /** 鏈�杩戜竴娆℃牳绠楁椂闂� */
     private LocalDateTime latestTime;
 
+    /** 鑳藉惁鍙戝竷 */
+    private Boolean canPublish;
+
+    private CalculateReportStatusEnum status;
+
+    /** 鏈�鏂颁竴娆℃墸娆� */
+    private BigDecimal latestDeductMoney;
+
     /** 鏄庣粏 */
     private List<CalculateRecordVO> recordList;
 

--
Gitblit v1.8.0