From 830bdcba8910f80221fc9a8488496970228cedb0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 10 一月 2025 14:15:50 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou

---
 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/Notices.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/Notices.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/Notices.java
index 028d091..f65fa78 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/Notices.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/Notices.java
@@ -24,8 +24,12 @@
 @ApiModel(value = "Notices对象", description = "系统通知管理")
 public class Notices extends BaseEntity {
 
-    @TableId(value = "id",type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
+
+    @ApiModelProperty("排序")
+    @TableField("sort")
+    private Integer sort;
 
     @ApiModelProperty("通知标题")
     @TableField("notice_title")
@@ -33,6 +37,6 @@
 
     @ApiModelProperty("通知内容")
     @TableField("notice_detail")
-    private String noticeDetail;
+    private Object noticeDetail;
 
 }

--
Gitblit v1.7.1