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/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