From 2757f1d46f388f684aad93b3dc7ad805c45c6248 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 14 一月 2026 09:28:39 +0800
Subject: [PATCH] Merge branch 'jtwy' into dev_New
---
src/main/java/com/ruoyi/collaborativeApproval/pojo/Notice.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/pojo/Notice.java b/src/main/java/com/ruoyi/collaborativeApproval/pojo/Notice.java
index 054418a..5ca6e4b 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/pojo/Notice.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/pojo/Notice.java
@@ -30,10 +30,10 @@
private String title;
/**
- * 鍏憡绫诲瀷锛�1鏀惧亣閫氱煡 2璁惧缁翠慨閫氱煡锛�
+ * 鍏憡绫诲瀷
*/
- @ApiModelProperty("鍏憡绫诲瀷锛�1鏀惧亣閫氱煡 2璁惧缁翠慨閫氱煡锛�")
- private Integer type;
+ @ApiModelProperty("鍏憡绫诲瀷")
+ private String type;
/**
* 鐘舵�侊紙0鑽夌 1鍙戝竷 2宸蹭笅绾匡級
--
Gitblit v1.9.3