From 4f39e676277d7a66e13d172288032ce16bb18e8c Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 22 四月 2026 17:05:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_河南_鹤壁天沐钢化玻璃厂' into dev_河南_鹤壁天沐钢化玻璃厂
---
src/main/java/com/ruoyi/collaborativeApproval/dto/NoticeDTO.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/dto/NoticeDTO.java b/src/main/java/com/ruoyi/collaborativeApproval/dto/NoticeDTO.java
index ade8acb..5d39815 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/dto/NoticeDTO.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/dto/NoticeDTO.java
@@ -2,10 +2,14 @@
import com.ruoyi.collaborativeApproval.pojo.Notice;
import lombok.Data;
+import lombok.EqualsAndHashCode;
@Data
+@EqualsAndHashCode(callSuper = true)
public class NoticeDTO extends Notice {
private String CreateUserName;
private Long count;
+
+ private String statusName;
}
--
Gitblit v1.9.3