From 81ba6f3ea498c43010f47c7ed6d6c0f121bb1f09 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期六, 24 八月 2024 14:38:00 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ycl-pojo/src/main/java/com/ycl/platform/domain/vo/ContractResultVO.java | 2 +- 1 files changed, 1 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..ca7956c 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; -- Gitblit v1.8.0