From 9490c47566a0f253f35a1019fd1b1e1473630d67 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期一, 20 一月 2025 09:48:53 +0800 Subject: [PATCH] Merge branch 'dev' --- ycl-pojo/src/main/java/com/ycl/platform/domain/vo/ContractResultVO.java | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/ContractResultVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/ContractResultVO.java index 8e496ec..ce5e3f5 100644 --- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/ContractResultVO.java +++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/ContractResultVO.java @@ -38,7 +38,7 @@ @Excel(name = "鑰冩牳鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd") private Date checkTime; - private String deleted; + private Integer deleted; @JsonFormat(pattern = "yyyy-MM-dd") private Date updateTime; @@ -49,4 +49,6 @@ @JsonFormat(pattern = "yyyy-MM-dd") private Date createEndTime; + private Integer whichYear; + private Integer whichMonth; } -- Gitblit v1.8.0