From 5ca038d888922e93bf45c7bd37f3c6dce849dcff Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 24 十二月 2021 11:36:02 +0800
Subject: [PATCH] update 调整监控依赖 从 common 迁移到 framework

---
 ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java |   58 +++++++++++++++++-----------------------------------------
 1 files changed, 17 insertions(+), 41 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java
index cdd7810..3b9fce0 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java
@@ -2,44 +2,46 @@
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.convert.ExcelDictConvert;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+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_config
  *
- * @author ruoyi
+ * @author Lion Li
  */
 
 @Data
-@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName("sys_config")
 @ExcelIgnoreUnannotated
-public class SysConfig implements Serializable {
-    private static final long serialVersionUID = 1L;
+@ApiModel("鍙傛暟閰嶇疆涓氬姟瀵硅薄")
+public class SysConfig extends BaseEntity {
 
     /**
      * 鍙傛暟涓婚敭
      */
+    @ApiModelProperty(value = "鍙傛暟涓婚敭")
     @ExcelProperty(value = "鍙傛暟涓婚敭")
-    @TableId(value = "config_id", type = IdType.AUTO)
+    @TableId(value = "config_id")
     private Long configId;
 
     /**
      * 鍙傛暟鍚嶇О
      */
+    @ApiModelProperty(value = "鍙傛暟鍚嶇О")
     @ExcelProperty(value = "鍙傛暟鍚嶇О")
     @NotBlank(message = "鍙傛暟鍚嶇О涓嶈兘涓虹┖")
     @Size(min = 0, max = 100, message = "鍙傛暟鍚嶇О涓嶈兘瓒呰繃100涓瓧绗�")
@@ -48,6 +50,7 @@
     /**
      * 鍙傛暟閿悕
      */
+    @ApiModelProperty(value = "鍙傛暟閿悕")
     @ExcelProperty(value = "鍙傛暟閿悕")
     @NotBlank(message = "鍙傛暟閿悕闀垮害涓嶈兘涓虹┖")
     @Size(min = 0, max = 100, message = "鍙傛暟閿悕闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
@@ -56,6 +59,7 @@
     /**
      * 鍙傛暟閿��
      */
+    @ApiModelProperty(value = "鍙傛暟閿��")
     @ExcelProperty(value = "鍙傛暟閿��")
     @NotBlank(message = "鍙傛暟閿�间笉鑳戒负绌�")
     @Size(min = 0, max = 500, message = "鍙傛暟閿�奸暱搴︿笉鑳借秴杩�500涓瓧绗�")
@@ -64,43 +68,15 @@
     /**
      * 绯荤粺鍐呯疆锛圷鏄� N鍚︼級
      */
+    @ApiModelProperty(value = "绯荤粺鍐呯疆锛圷鏄� N鍚︼級")
     @ExcelProperty(value = "绯荤粺鍐呯疆", converter = ExcelDictConvert.class)
 	@ExcelDictFormat(dictType = "sys_yes_no")
     private String configType;
 
     /**
-     * 鍒涘缓鑰�
-     */
-    @TableField(fill = FieldFill.INSERT)
-    private String createBy;
-
-    /**
-     * 鍒涘缓鏃堕棿
-     */
-    @TableField(fill = FieldFill.INSERT)
-    private Date createTime;
-
-    /**
-     * 鏇存柊鑰�
-     */
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private String updateBy;
-
-    /**
-     * 鏇存柊鏃堕棿
-     */
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private Date updateTime;
-
-    /**
      * 澶囨敞
      */
+    @ApiModelProperty(value = "澶囨敞")
     private String remark;
-
-    /**
-     * 璇锋眰鍙傛暟
-     */
-    @TableField(exist = false)
-    private Map<String, Object> params = new HashMap<>();
 
 }

--
Gitblit v1.9.3