Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/BaseMonitor

base-common/src/main/java/com/ozs/common/core/domain/entity/SysDictType.java

@@ -31,13 +31,26 @@ public class SysDictType extends BaseEntity
     private String dictType;
 
     /** 数据类型 1系统2业务 */
-    @Excel(name = "数据类型", readConverterExp = "1系统2业务")
     private Integer dataType;
 
     /** 状态（1正常 2停用） */
-    @Excel(name = "状态", readConverterExp = "1正常 2停用")
+    @Excel(name = "状态", readConverterExp = "1=正常,2=停用")
     private Integer status;
 
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remark;
+
+    @Override
+    public String getRemark() {
+        return remark;
+    }
+
+    @Override
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
     public Long getDictId()
     {
         return dictId;