From 7a52cd14e12e5b1053a26ed5a4799da7a09d4b16 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 24 Jul 2018 11:51:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/entity/Dictionary.java | 34 +++++++++-------------------------
1 files changed, 9 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/moral/entity/Dictionary.java b/src/main/java/com/moral/entity/Dictionary.java
index be69fe8..e09ee42 100644
--- a/src/main/java/com/moral/entity/Dictionary.java
+++ b/src/main/java/com/moral/entity/Dictionary.java
@@ -1,33 +1,17 @@
package com.moral.entity;
-public class Dictionary {
- private String dictName;
+import lombok.Data;
- private Integer dictValue;
+@Data
+public class Dictionary {
+ private String dictKey;
+
+ private Integer id;
+
+ private String dictName;
private Integer isDelete;
- public String getDictName() {
- return dictName;
- }
+ private String description;
- public void setDictName(String dictName) {
- this.dictName = dictName == null ? null : dictName.trim();
- }
-
- public Integer getDictValue() {
- return dictValue;
- }
-
- public void setDictValue(Integer dictValue) {
- this.dictValue = dictValue;
- }
-
- public Integer getIsDelete() {
- return isDelete;
- }
-
- public void setIsDelete(Integer isDelete) {
- this.isDelete = isDelete;
- }
}
\ No newline at end of file
--
Gitblit v1.8.0