From a1278f8b1edebde8114ca4add0f32d74495a835b Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 20 二月 2025 14:21:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateReportDetailVO.java | 2 ++
1 files changed, 2 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 2717bf1..3d4870e 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
@@ -24,6 +24,7 @@
private Integer id;
+
@JsonFormat(pattern = "yyyy-MM-dd")
private Date createTime;
@@ -33,6 +34,7 @@
private Integer whichYear;
/** 杩愮淮鍗曚綅 */
private String unitName;
+ private Integer unitId;
/** 鍚堝悓鍚嶇О */
private String contractName;
--
Gitblit v1.8.0