Browse Source

!89 update 字典类型 数据解析状态对应字典调整
Merge pull request !89 from 抓蛙师/auto-7465549-dev-1631512665539

疯狂的狮子Li 3 years ago
parent
commit
d6107025fa

+ 1 - 1
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;
 
 	/**

+ 1 - 1
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;
 
 	/**