字典类型数据解析状态对应字典调整

3 years ago · a7ecfb68c1
parent 188d27159d
commit a7ecfb68c1
2 changed files with 2 additions and 2 deletions
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java
@ -90,7 +90,7 @@ public class SysDictData implements Serializable {
 	 * 状态（0正常 1停用）
 	 */
 	@ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
-	@ExcelDictFormat(dictType = "sys_common_status")
+	@ExcelDictFormat(dictType = "sys_normal_disable")
 	private String status;

 	/**
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java
@ -57,7 +57,7 @@ public class SysDictType implements Serializable {
 	 * 状态（0正常 1停用）
 	 */
 	@ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
-	@ExcelDictFormat(dictType = "sys_common_status")
+	@ExcelDictFormat(dictType = "sys_normal_disable")
 	private String status;

 	/**