From 3df04e32e4190bfe8a74998f19fedbbfa9747f29 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 04 九月 2024 05:49:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateReportVO.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 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 7560cef..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,13 +7,10 @@
import java.util.List;
import java.time.LocalDateTime;
-import com.ycl.platform.domain.form.CalculateRecordForm;
+import enumeration.general.CalculateReportStatusEnum;
import org.springframework.lang.NonNull;
import org.springframework.beans.BeanUtils;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import lombok.experimental.Accessors;
/**
* 鏍哥畻鎶ュ憡灞曠ず
@@ -39,15 +36,20 @@
/** 鎵ｅ噺鎬婚噾棰� */
private BigDecimal deductMoney;
- /** 鍝勾鐨� */
- private Integer whichYear;
-
- /** 鍝湀鐨� */
- private Integer whichMonth;
-
/** 淇敼浜� */
private String updateBy;
+ /** 鏈�杩戜竴娆℃牳绠楁椂闂� */
+ private LocalDateTime latestTime;
+
+ /** 鑳藉惁鍙戝竷 */
+ private Boolean canPublish;
+
+ private CalculateReportStatusEnum status;
+
+ /** 鏈�鏂颁竴娆℃墸娆� */
+ private BigDecimal latestDeductMoney;
+
/** 鏄庣粏 */
private List<CalculateRecordVO> recordList;
--
Gitblit v1.8.0