admin/lx-admin-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge pull request !89 from 抓蛙师/auto-7465549-dev-1631512665539
This commit is contained in:
疯狂的狮子Li 2021-09-13 05:58:57 +00:00 committed by Gitee
commit d6107025fa
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java
View File

@ -90,7 +90,7 @@ public class SysDictData implements Serializable {
* 状态（0正常 1停用） * 状态（0正常 1停用）
*/ */
@ExcelProperty(value = "状态", converter = ExcelDictConvert.class) @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "sys_common_status") @ExcelDictFormat(dictType = "sys_normal_disable")
private String status; private String status;
/** /**

2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java
View File

@ -57,7 +57,7 @@ public class SysDictType implements Serializable {
* 状态（0正常 1停用） * 状态（0正常 1停用）
*/ */
@ExcelProperty(value = "状态", converter = ExcelDictConvert.class) @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "sys_common_status") @ExcelDictFormat(dictType = "sys_normal_disable")
private String status; private String status;
/** /**