From e2edaf30f4bf2213fe55c9817980001a1ea23e9f Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期三, 19 二月 2025 09:26:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateRecordVO.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateRecordVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateRecordVO.java
index 61523f6..f311d58 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateRecordVO.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateRecordVO.java
@@ -1,9 +1,11 @@
package com.ycl.platform.domain.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.platform.base.AbsVo;
import com.ycl.platform.domain.entity.CalculateRecord;
import java.math.BigDecimal;
+import java.util.Date;
import java.util.List;
import java.time.LocalDateTime;
import org.springframework.lang.NonNull;
@@ -20,7 +22,12 @@
* @since 2024-04-23
*/
@Data
-public class CalculateRecordVO extends AbsVo {
+public class CalculateRecordVO {
+
+ private Integer id;
+
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date createTime;
/** 鍚堝悓 */
private Integer contractId;
@@ -39,6 +46,10 @@
/** 鍝湀 */
private Integer whichMonth;
+ /** 鏈�鏂颁竴鏉℃牳绠楁爣璇� */
+ private Boolean latest;
+
+ private String status;
public static CalculateRecordVO getVoByEntity(@NonNull CalculateRecord entity, CalculateRecordVO vo) {
if(vo == null) {
vo = new CalculateRecordVO();
--
Gitblit v1.8.0