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/SysDictData.java

@@ -45,11 +45,11 @@ public class SysDictData extends BaseEntity
     private String listClass;
 
     /** 是否默认（Y是 N否） */
-    @Excel(name = "是否默认", readConverterExp = "（1是 2否）")
+    @Excel(name = "是否默认", readConverterExp = "1=是,2=否")
     private Integer isDefault;
 
     /** 状态（1正常 2停用） */
-    @Excel(name = "状态", readConverterExp = "1正常 2停用")
+    @Excel(name = "状态", readConverterExp = "1=正常,2=停用")
     private Integer status;
 
     public Long getDictCode()