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/entity/CalculateReport.java | 11 +++--------
1 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CalculateReport.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CalculateReport.java
index daf7456..da68f47 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CalculateReport.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CalculateReport.java
@@ -5,6 +5,7 @@
import java.math.BigDecimal;
import java.time.LocalDateTime;
import com.ycl.platform.base.AbsEntity;
+import enumeration.general.CalculateReportStatusEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -36,14 +37,6 @@
@TableField("deduct_money")
private BigDecimal deductMoney;
- @ApiModelProperty("鍝勾鐨�")
- @TableField("which_year")
- private Integer whichYear;
-
- @ApiModelProperty("鍝湀鐨�")
- @TableField("which_month")
- private Integer whichMonth;
-
@ApiModelProperty("淇敼浜�")
@TableField("update_by")
private String updateBy;
@@ -52,5 +45,7 @@
@TableField("latest_time")
private LocalDateTime latestTime;
+ @TableField("status")
+ private CalculateReportStatusEnum status;
}
--
Gitblit v1.8.0