From 71a2a8245db4c04be3f96a9eb9b47931d3130650 Mon Sep 17 00:00:00 2001
From: zlyx <1242874891@qq.com>
Date: 星期三, 18 一月 2023 17:09:43 +0800
Subject: [PATCH] refactor 重构 common, framework 包结构, 参照 cloud 版本拆分子模块 ; update 更新模块包名 ; delete 移除 sms 模块, oss 模块, framework 模块 (并入 common 模块) ;
---
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java | 29 +++++++++--------------------
1 files changed, 9 insertions(+), 20 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 3b9fce0..831eca5 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
@@ -4,17 +4,14 @@
import com.alibaba.excel.annotation.ExcelProperty;
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 com.ruoyi.common.core.web.domain.BaseEntity;
+import com.ruoyi.common.excel.annotation.ExcelDictFormat;
+import com.ruoyi.common.excel.convert.ExcelDictConvert;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
/**
* 鍙傛暟閰嶇疆琛� sys_config
@@ -24,16 +21,13 @@
@Data
@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
@TableName("sys_config")
@ExcelIgnoreUnannotated
-@ApiModel("鍙傛暟閰嶇疆涓氬姟瀵硅薄")
public class SysConfig extends BaseEntity {
/**
* 鍙傛暟涓婚敭
*/
- @ApiModelProperty(value = "鍙傛暟涓婚敭")
@ExcelProperty(value = "鍙傛暟涓婚敭")
@TableId(value = "config_id")
private Long configId;
@@ -41,42 +35,37 @@
/**
* 鍙傛暟鍚嶇О
*/
- @ApiModelProperty(value = "鍙傛暟鍚嶇О")
@ExcelProperty(value = "鍙傛暟鍚嶇О")
@NotBlank(message = "鍙傛暟鍚嶇О涓嶈兘涓虹┖")
- @Size(min = 0, max = 100, message = "鍙傛暟鍚嶇О涓嶈兘瓒呰繃100涓瓧绗�")
+ @Size(min = 0, max = 100, message = "鍙傛暟鍚嶇О涓嶈兘瓒呰繃{max}涓瓧绗�")
private String configName;
/**
* 鍙傛暟閿悕
*/
- @ApiModelProperty(value = "鍙傛暟閿悕")
@ExcelProperty(value = "鍙傛暟閿悕")
@NotBlank(message = "鍙傛暟閿悕闀垮害涓嶈兘涓虹┖")
- @Size(min = 0, max = 100, message = "鍙傛暟閿悕闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
+ @Size(min = 0, max = 100, message = "鍙傛暟閿悕闀垮害涓嶈兘瓒呰繃{max}涓瓧绗�")
private String configKey;
/**
* 鍙傛暟閿��
*/
- @ApiModelProperty(value = "鍙傛暟閿��")
@ExcelProperty(value = "鍙傛暟閿��")
@NotBlank(message = "鍙傛暟閿�间笉鑳戒负绌�")
- @Size(min = 0, max = 500, message = "鍙傛暟閿�奸暱搴︿笉鑳借秴杩�500涓瓧绗�")
+ @Size(min = 0, max = 500, message = "鍙傛暟閿�奸暱搴︿笉鑳借秴杩噞max}涓瓧绗�")
private String configValue;
/**
* 绯荤粺鍐呯疆锛圷鏄� N鍚︼級
*/
- @ApiModelProperty(value = "绯荤粺鍐呯疆锛圷鏄� N鍚︼級")
@ExcelProperty(value = "绯荤粺鍐呯疆", converter = ExcelDictConvert.class)
- @ExcelDictFormat(dictType = "sys_yes_no")
+ @ExcelDictFormat(dictType = "sys_yes_no")
private String configType;
/**
* 澶囨敞
*/
- @ApiModelProperty(value = "澶囨敞")
private String remark;
}
--
Gitblit v1.9.3