From 695cb6d76b838b1e4cb161bae335faa948dca12a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 27 十月 2021 13:16:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken

---
 ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java |   59 +++++++++++++++--------------------------------------------
 1 files changed, 15 insertions(+), 44 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java
index e50ecd1..2b230bf 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java
@@ -1,39 +1,38 @@
 package com.ruoyi.system.domain;
 
-import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
-import java.io.Serializable;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * 閫氱煡鍏憡琛� sys_notice
  *
- * @author ruoyi
+ * @author Lion Li
  */
 @Data
-@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName("sys_notice")
-public class SysNotice implements Serializable {
-    private static final long serialVersionUID = 1L;
+public class SysNotice extends BaseEntity {
 
     /**
      * 鍏憡ID
      */
-    @TableId(value = "notice_id", type = IdType.AUTO)
+    @ApiModelProperty(value = "鍏憡ID")
+    @TableId(value = "notice_id")
     private Long noticeId;
 
     /**
      * 鍏憡鏍囬
      */
+    @ApiModelProperty(value = "鍏憡鏍囬")
     @NotBlank(message = "鍏憡鏍囬涓嶈兘涓虹┖")
     @Size(min = 0, max = 50, message = "鍏憡鏍囬涓嶈兘瓒呰繃50涓瓧绗�")
     private String noticeTitle;
@@ -41,53 +40,25 @@
     /**
      * 鍏憡绫诲瀷锛�1閫氱煡 2鍏憡锛�
      */
+    @ApiModelProperty(value = "鍏憡绫诲瀷锛�1閫氱煡 2鍏憡锛�")
     private String noticeType;
 
     /**
      * 鍏憡鍐呭
      */
+    @ApiModelProperty(value = "鍏憡鍐呭")
     private String noticeContent;
 
     /**
      * 鍏憡鐘舵�侊紙0姝ｅ父 1鍏抽棴锛�
      */
+    @ApiModelProperty(value = "鍏憡鐘舵�侊紙0姝ｅ父 1鍏抽棴锛�")
     private String status;
-
-    /**
-     * 鍒涘缓鑰�
-     */
-    @TableField(fill = FieldFill.INSERT)
-    private String createBy;
-
-    /**
-     * 鍒涘缓鏃堕棿
-     */
-    @TableField(fill = FieldFill.INSERT)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-
-    /**
-     * 鏇存柊鑰�
-     */
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private String updateBy;
-
-    /**
-     * 鏇存柊鏃堕棿
-     */
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
 
     /**
      * 澶囨敞
      */
+    @ApiModelProperty(value = "澶囨敞")
     private String remark;
-
-    /**
-     * 璇锋眰鍙傛暟
-     */
-    @TableField(exist = false)
-    private Map<String, Object> params = new HashMap<>();
 
 }

--
Gitblit v1.9.3