From 7d1c53f92738166c1ced1a796e2bc95d26d35fa0 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期三, 18 一月 2023 11:59:32 +0800 Subject: [PATCH] update 优化 修改 oss 配置页面开关说明 避免造成误解 --- ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java | 63 +++++++------------------------ 1 files changed, 14 insertions(+), 49 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..ab33482 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,39 +2,34 @@ 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 lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.Accessors; +import lombok.EqualsAndHashCode; -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; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; /** * 鍙傛暟閰嶇疆琛� sys_config * - * @author ruoyi + * @author Lion Li */ @Data -@NoArgsConstructor -@Accessors(chain = true) +@EqualsAndHashCode(callSuper = true) @TableName("sys_config") @ExcelIgnoreUnannotated -public class SysConfig implements Serializable { - private static final long serialVersionUID = 1L; +public class SysConfig extends BaseEntity { /** * 鍙傛暟涓婚敭 */ @ExcelProperty(value = "鍙傛暟涓婚敭") - @TableId(value = "config_id", type = IdType.AUTO) + @TableId(value = "config_id") private Long configId; /** @@ -42,7 +37,7 @@ */ @ExcelProperty(value = "鍙傛暟鍚嶇О") @NotBlank(message = "鍙傛暟鍚嶇О涓嶈兘涓虹┖") - @Size(min = 0, max = 100, message = "鍙傛暟鍚嶇О涓嶈兘瓒呰繃100涓瓧绗�") + @Size(min = 0, max = 100, message = "鍙傛暟鍚嶇О涓嶈兘瓒呰繃{max}涓瓧绗�") private String configName; /** @@ -50,7 +45,7 @@ */ @ExcelProperty(value = "鍙傛暟閿悕") @NotBlank(message = "鍙傛暟閿悕闀垮害涓嶈兘涓虹┖") - @Size(min = 0, max = 100, message = "鍙傛暟閿悕闀垮害涓嶈兘瓒呰繃100涓瓧绗�") + @Size(min = 0, max = 100, message = "鍙傛暟閿悕闀垮害涓嶈兘瓒呰繃{max}涓瓧绗�") private String configKey; /** @@ -58,49 +53,19 @@ */ @ExcelProperty(value = "鍙傛暟閿��") @NotBlank(message = "鍙傛暟閿�间笉鑳戒负绌�") - @Size(min = 0, max = 500, message = "鍙傛暟閿�奸暱搴︿笉鑳借秴杩�500涓瓧绗�") + @Size(min = 0, max = 500, message = "鍙傛暟閿�奸暱搴︿笉鑳借秴杩噞max}涓瓧绗�") private String configValue; /** * 绯荤粺鍐呯疆锛圷鏄� N鍚︼級 */ @ExcelProperty(value = "绯荤粺鍐呯疆", converter = ExcelDictConvert.class) - @ExcelDictFormat(dictType = "sys_yes_no") + @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; /** * 澶囨敞 */ private String remark; - - /** - * 璇锋眰鍙傛暟 - */ - @TableField(exist = false) - private Map<String, Object> params = new HashMap<>(); } -- Gitblit v1.9.3