From 2d4d397ce9ea8e53d4a63b6463c02a7586fb27ea Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Thu, 08 Aug 2019 17:03:55 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/java/com/moral/entity/DictionaryData.java | 62 +++---------------------------
1 files changed, 7 insertions(+), 55 deletions(-)
diff --git a/src/main/java/com/moral/entity/DictionaryData.java b/src/main/java/com/moral/entity/DictionaryData.java
index 05fdaf4..36893dd 100644
--- a/src/main/java/com/moral/entity/DictionaryData.java
+++ b/src/main/java/com/moral/entity/DictionaryData.java
@@ -1,9 +1,14 @@
package com.moral.entity;
+import lombok.Data;
+
+@Data
public class DictionaryData {
private Integer id;
- private Integer dictValue;
+ private Integer dictId;
+
+ private String dictDataKey;
private String dictDataName;
@@ -15,59 +20,6 @@
private Integer parentId;
- public Integer getId() {
- return id;
- }
+ private String description;
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getDictValue() {
- return dictValue;
- }
-
- public void setDictValue(Integer dictValue) {
- this.dictValue = dictValue;
- }
-
- public String getDictDataName() {
- return dictDataName;
- }
-
- public void setDictDataName(String dictDataName) {
- this.dictDataName = dictDataName == null ? null : dictDataName.trim();
- }
-
- public Object getDictDataValue() {
- return dictDataValue;
- }
-
- public void setDictDataValue(Object dictDataValue) {
- this.dictDataValue = dictDataValue;
- }
-
- public Integer getIsFixed() {
- return isFixed;
- }
-
- public void setIsFixed(Integer isFixed) {
- this.isFixed = isFixed;
- }
-
- public Integer getIsDelete() {
- return isDelete;
- }
-
- public void setIsDelete(Integer isDelete) {
- this.isDelete = isDelete;
- }
-
- public Integer getParentId() {
- return parentId;
- }
-
- public void setParentId(Integer parentId) {
- this.parentId = parentId;
- }
}
\ No newline at end of file
--
Gitblit v1.8.0