From 645fe0426017b280aa107b9363d37dc85470601b Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 12 一月 2026 17:17:50 +0800
Subject: [PATCH] Merge branch 'jtwy' into dev_New

---
 src/main/java/com/ruoyi/project/system/domain/SysNotice.java |   96 ++++++++++++++++++------------------------------
 1 files changed, 36 insertions(+), 60 deletions(-)

diff --git a/src/main/java/com/ruoyi/project/system/domain/SysNotice.java b/src/main/java/com/ruoyi/project/system/domain/SysNotice.java
index 635e691..a7e696f 100644
--- a/src/main/java/com/ruoyi/project/system/domain/SysNotice.java
+++ b/src/main/java/com/ruoyi/project/system/domain/SysNotice.java
@@ -2,17 +2,25 @@
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.xss.Xss;
 import com.ruoyi.framework.web.domain.BaseEntity;
 
+import java.time.LocalDateTime;
+
 /**
  * 閫氱煡鍏憡琛� sys_notice
- * 
+ *
  * @author ruoyi
  */
-public class SysNotice extends BaseEntity
+@Data
+public class SysNotice
 {
     private static final long serialVersionUID = 1L;
 
@@ -31,72 +39,40 @@
     /** 鍏憡鐘舵�侊紙0姝ｅ父 1鍏抽棴锛� */
     private String status;
 
-    public Long getNoticeId()
-    {
-        return noticeId;
-    }
+    /** 鍙戦�佷汉id */
+    private Long senderId;
 
-    public void setNoticeId(Long noticeId)
-    {
-        this.noticeId = noticeId;
-    }
+    /** 鏀朵欢浜篿d */
+    private Long consigneeId;
 
-    public void setNoticeTitle(String noticeTitle)
-    {
-        this.noticeTitle = noticeTitle;
-    }
+    /** 璺宠浆璺緞 */
+    private String jumpPath;
 
-    @Xss(message = "鍏憡鏍囬涓嶈兘鍖呭惈鑴氭湰瀛楃")
-    @NotBlank(message = "鍏憡鏍囬涓嶈兘涓虹┖")
-    @Size(min = 0, max = 50, message = "鍏憡鏍囬涓嶈兘瓒呰繃50涓瓧绗�")
-    public String getNoticeTitle()
-    {
-        return noticeTitle;
-    }
+    /** 鍒涘缓鑰� */
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
 
-    public void setNoticeType(String noticeType)
-    {
-        this.noticeType = noticeType;
-    }
+    /** 鍒涘缓鏃堕棿 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
 
-    public String getNoticeType()
-    {
-        return noticeType;
-    }
+    /** 鏇存柊鑰� */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateBy;
 
-    public void setNoticeContent(String noticeContent)
-    {
-        this.noticeContent = noticeContent;
-    }
+    /** 鏇存柊鏃堕棿 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private LocalDateTime updateTime;
 
-    public String getNoticeContent()
-    {
-        return noticeContent;
-    }
+    /** 澶囨敞 */
+    private String remark;
 
-    public void setStatus(String status)
-    {
-        this.status = status;
-    }
+    /**
+     * 绉熸埛id
+     */
+    private Long tenantId;
 
-    public String getStatus()
-    {
-        return status;
-    }
 
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("noticeId", getNoticeId())
-            .append("noticeTitle", getNoticeTitle())
-            .append("noticeType", getNoticeType())
-            .append("noticeContent", getNoticeContent())
-            .append("status", getStatus())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
-    }
 }

--
Gitblit v1.9.3