From 259e978c64b36f57aa1959c6d760416b86b26c34 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 05 一月 2026 10:51:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/sqd' into sqd
---
src/main/java/com/ruoyi/collaborativeApproval/pojo/Notice.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/pojo/Notice.java b/src/main/java/com/ruoyi/collaborativeApproval/pojo/Notice.java
index 33c3f72..cc9f926 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/pojo/Notice.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/pojo/Notice.java
@@ -41,8 +41,6 @@
@ApiModelProperty("鐘舵�侊紙0鑽夌 1鍙戝竷 2宸蹭笅绾匡級")
private Integer status;
- private String statusName;
-
/**
* 鍏憡鍐呭
*/
@@ -58,6 +56,7 @@
/**
* 杩囨湡鏃堕棿
*/
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date expirationDate;
--
Gitblit v1.9.3