From a53a3b3119659d6ec28b458dcefd46f4ec49d55c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 17 七月 2020 16:43:47 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
ruoyi/src/main/java/com/ruoyi/project/system/domain/SysConfig.java | 197 +++++++++++++++++++++++++++---------------------
1 files changed, 111 insertions(+), 86 deletions(-)
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysConfig.java b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysConfig.java
index 9b4352a..f9b290b 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysConfig.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysConfig.java
@@ -1,86 +1,111 @@
-package com.ruoyi.project.system.domain;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-import com.ruoyi.framework.web.domain.BaseEntity;
-
-/**
- * 鍙傛暟閰嶇疆琛� sys_config
- *
- * @author ruoyi
- */
-public class SysConfig extends BaseEntity
-{
- private static final long serialVersionUID = 1L;
-
- /** 鍙傛暟涓婚敭 */
- private Long configId;
-
- /** 鍙傛暟鍚嶇О */
- private String configName;
-
- /** 鍙傛暟閿悕 */
- private String configKey;
-
- /** 鍙傛暟閿�� */
- private String configValue;
-
- /** 绯荤粺鍐呯疆锛圷鏄� N鍚︼級 */
- private String configType;
-
- public Long getConfigId()
- {
- return configId;
- }
-
- public void setConfigId(Long configId)
- {
- this.configId = configId;
- }
-
- @NotBlank(message = "鍙傛暟鍚嶇О涓嶈兘涓虹┖")
- @Size(min = 0, max = 100, message = "鍙傛暟鍚嶇О涓嶈兘瓒呰繃100涓瓧绗�")
- public String getConfigName()
- {
- return configName;
- }
-
- public void setConfigName(String configName)
- {
- this.configName = configName;
- }
-
- @NotBlank(message = "鍙傛暟閿悕闀垮害涓嶈兘涓虹┖")
- @Size(min = 0, max = 100, message = "鍙傛暟閿悕闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
- public String getConfigKey()
- {
- return configKey;
- }
-
- public void setConfigKey(String configKey)
- {
- this.configKey = configKey;
- }
-
- @NotBlank(message = "鍙傛暟閿�间笉鑳戒负绌�")
- @Size(min = 0, max = 500, message = "鍙傛暟閿�奸暱搴︿笉鑳借秴杩�500涓瓧绗�")
- public String getConfigValue()
- {
- return configValue;
- }
-
- public void setConfigValue(String configValue)
- {
- this.configValue = configValue;
- }
-
- public String getConfigType()
- {
- return configType;
- }
-
- public void setConfigType(String configType)
- {
- this.configType = configType;
- }
-}
+package com.ruoyi.project.system.domain;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType;
+import com.ruoyi.framework.web.domain.BaseEntity;
+
+/**
+ * 鍙傛暟閰嶇疆琛� sys_config
+ *
+ * @author ruoyi
+ */
+public class SysConfig extends BaseEntity
+{
+ private static final long serialVersionUID = 1L;
+
+ /** 鍙傛暟涓婚敭 */
+ @Excel(name = "鍙傛暟涓婚敭", cellType = ColumnType.NUMERIC)
+ private Long configId;
+
+ /** 鍙傛暟鍚嶇О */
+ @Excel(name = "鍙傛暟鍚嶇О")
+ private String configName;
+
+ /** 鍙傛暟閿悕 */
+ @Excel(name = "鍙傛暟閿悕")
+ private String configKey;
+
+ /** 鍙傛暟閿�� */
+ @Excel(name = "鍙傛暟閿��")
+ private String configValue;
+
+ /** 绯荤粺鍐呯疆锛圷鏄� N鍚︼級 */
+ @Excel(name = "绯荤粺鍐呯疆", readConverterExp = "Y=鏄�,N=鍚�")
+ private String configType;
+
+ public Long getConfigId()
+ {
+ return configId;
+ }
+
+ public void setConfigId(Long configId)
+ {
+ this.configId = configId;
+ }
+
+ @NotBlank(message = "鍙傛暟鍚嶇О涓嶈兘涓虹┖")
+ @Size(min = 0, max = 100, message = "鍙傛暟鍚嶇О涓嶈兘瓒呰繃100涓瓧绗�")
+ public String getConfigName()
+ {
+ return configName;
+ }
+
+ public void setConfigName(String configName)
+ {
+ this.configName = configName;
+ }
+
+ @NotBlank(message = "鍙傛暟閿悕闀垮害涓嶈兘涓虹┖")
+ @Size(min = 0, max = 100, message = "鍙傛暟閿悕闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
+ public String getConfigKey()
+ {
+ return configKey;
+ }
+
+ public void setConfigKey(String configKey)
+ {
+ this.configKey = configKey;
+ }
+
+ @NotBlank(message = "鍙傛暟閿�间笉鑳戒负绌�")
+ @Size(min = 0, max = 500, message = "鍙傛暟閿�奸暱搴︿笉鑳借秴杩�500涓瓧绗�")
+ public String getConfigValue()
+ {
+ return configValue;
+ }
+
+ public void setConfigValue(String configValue)
+ {
+ this.configValue = configValue;
+ }
+
+ public String getConfigType()
+ {
+ return configType;
+ }
+
+ public void setConfigType(String configType)
+ {
+ this.configType = configType;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("configId", getConfigId())
+ .append("configName", getConfigName())
+ .append("configKey", getConfigKey())
+ .append("configValue", getConfigValue())
+ .append("configType", getConfigType())
+ .append("createBy", getCreateBy())
+ .append("createTime", getCreateTime())
+ .append("updateBy", getUpdateBy())
+ .append("updateTime", getUpdateTime())
+ .append("remark", getRemark())
+ .toString();
+ }
+}
--
Gitblit v1.9.3