From b1afb78ca252faa5b05a293f1b7467b1315c980f Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 19 三月 2020 09:10:03 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
ruoyi/src/main/java/com/ruoyi/project/system/domain/SysDictType.java | 165 +++++++++++++++++++++++++++++++-----------------------
1 files changed, 94 insertions(+), 71 deletions(-)
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysDictType.java b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysDictType.java
index 8d3021e..7887e66 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysDictType.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/domain/SysDictType.java
@@ -1,71 +1,94 @@
-package com.ruoyi.project.system.domain;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-import com.ruoyi.framework.web.domain.BaseEntity;
-
-/**
- * 瀛楀吀绫诲瀷琛� sys_dict_type
- *
- * @author ruoyi
- */
-public class SysDictType extends BaseEntity
-{
- private static final long serialVersionUID = 1L;
-
- /** 瀛楀吀涓婚敭 */
- private Long dictId;
-
- /** 瀛楀吀鍚嶇О */
- private String dictName;
-
- /** 瀛楀吀绫诲瀷 */
- private String dictType;
-
- /** 鐘舵�侊紙0姝ｅ父 1鍋滅敤锛� */
- private String status;
-
- public Long getDictId()
- {
- return dictId;
- }
-
- public void setDictId(Long dictId)
- {
- this.dictId = dictId;
- }
-
- @NotBlank(message = "瀛楀吀鍚嶇О涓嶈兘涓虹┖")
- @Size(min = 0, max = 100, message = "瀛楀吀绫诲瀷鍚嶇О闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
- public String getDictName()
- {
- return dictName;
- }
-
- public void setDictName(String dictName)
- {
- this.dictName = dictName;
- }
-
- @NotBlank(message = "瀛楀吀绫诲瀷涓嶈兘涓虹┖")
- @Size(min = 0, max = 100, message = "瀛楀吀绫诲瀷绫诲瀷闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
- public String getDictType()
- {
- return dictType;
- }
-
- public void setDictType(String dictType)
- {
- this.dictType = dictType;
- }
-
- public String getStatus()
- {
- return status;
- }
-
- public void setStatus(String status)
- {
- this.status = status;
- }
-}
+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_dict_type
+ *
+ * @author ruoyi
+ */
+public class SysDictType extends BaseEntity
+{
+ private static final long serialVersionUID = 1L;
+
+ /** 瀛楀吀涓婚敭 */
+ @Excel(name = "瀛楀吀涓婚敭", cellType = ColumnType.NUMERIC)
+ private Long dictId;
+
+ /** 瀛楀吀鍚嶇О */
+ @Excel(name = "瀛楀吀鍚嶇О")
+ private String dictName;
+
+ /** 瀛楀吀绫诲瀷 */
+ @Excel(name = "瀛楀吀绫诲瀷")
+ private String dictType;
+
+ /** 鐘舵�侊紙0姝ｅ父 1鍋滅敤锛� */
+ @Excel(name = "鐘舵��", readConverterExp = "0=姝ｅ父,1=鍋滅敤")
+ private String status;
+
+ public Long getDictId()
+ {
+ return dictId;
+ }
+
+ public void setDictId(Long dictId)
+ {
+ this.dictId = dictId;
+ }
+
+ @NotBlank(message = "瀛楀吀鍚嶇О涓嶈兘涓虹┖")
+ @Size(min = 0, max = 100, message = "瀛楀吀绫诲瀷鍚嶇О闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
+ public String getDictName()
+ {
+ return dictName;
+ }
+
+ public void setDictName(String dictName)
+ {
+ this.dictName = dictName;
+ }
+
+ @NotBlank(message = "瀛楀吀绫诲瀷涓嶈兘涓虹┖")
+ @Size(min = 0, max = 100, message = "瀛楀吀绫诲瀷绫诲瀷闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
+ public String getDictType()
+ {
+ return dictType;
+ }
+
+ public void setDictType(String dictType)
+ {
+ this.dictType = dictType;
+ }
+
+ public String getStatus()
+ {
+ return status;
+ }
+
+ public void setStatus(String status)
+ {
+ this.status = status;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("dictId", getDictId())
+ .append("dictName", getDictName())
+ .append("dictType", getDictType())
+ .append("status", getStatus())
+ .append("createBy", getCreateBy())
+ .append("createTime", getCreateTime())
+ .append("updateBy", getUpdateBy())
+ .append("updateTime", getUpdateTime())
+ .append("remark", getRemark())
+ .toString();
+ }
+}
--
Gitblit v1.9.3