From d32fa50fca18a3fff89b9ec22deaa3d964ddd19b Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 27 Jun 2018 12:34:27 +0800
Subject: [PATCH] 大屏布局监控点 返回配置数据

---
 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