From 3f10aa699267f13d8575b92a9634f2c037c1f183 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 26 八月 2024 19:42:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateReportDetailVO.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateReportDetailVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateReportDetailVO.java
index 7ba6405..4f6d8e4 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateReportDetailVO.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateReportDetailVO.java
@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.platform.base.AbsVo;
import com.ycl.platform.domain.entity.CalculateReport;
+import enumeration.general.CalculateReportStatusEnum;
import lombok.Data;
import org.springframework.beans.BeanUtils;
import org.springframework.lang.NonNull;
@@ -48,6 +49,8 @@
/** 鏍哥畻瑙勫垯 */
private List<CalculateMoneyRuleVO> ruleList;
+ private CalculateReportStatusEnum status;
+
public static CalculateReportDetailVO getVoByEntity(@NonNull CalculateReport entity, CalculateReportDetailVO vo) {
if(vo == null) {
vo = new CalculateReportDetailVO();
--
Gitblit v1.8.0