From 5117fe2958a1bcec82e09fce01e49bb0bc2e0ba4 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 14 十二月 2022 15:11:09 +0800
Subject: [PATCH] update 同步 ruoyi 相关提交 * fix 修复 文件名包含特殊字符（+、-、*...）的文件无法下载问题 * update 优化 弹窗内容过多展示不全问题 * update echarts 4.9.0 => 5.4.0 * fix 修复 Vue3树形下拉不能默认选中 * update 优化 删除fuse无效选项maxPatternLength * fix 修复 代码生成图片/文件/单选时选择必填无法校验问题 * fix 修复 修改参数键名时 未移除过期缓存配置
---
ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserExportVo.java | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserExportVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserExportVo.java
index c43c8a5..a50283d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserExportVo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserExportVo.java
@@ -5,7 +5,6 @@
import com.ruoyi.common.convert.ExcelDictConvert;
import lombok.Data;
import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
@@ -18,7 +17,6 @@
@Data
@NoArgsConstructor
-@Accessors(chain = true)
public class SysUserExportVo implements Serializable {
private static final long serialVersionUID = 1L;
@@ -63,7 +61,7 @@
* 甯愬彿鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�
*/
@ExcelProperty(value = "甯愬彿鐘舵��", converter = ExcelDictConvert.class)
- @ExcelDictFormat(dictType = "sys_common_status")
+ @ExcelDictFormat(dictType = "sys_normal_disable")
private String status;
/**
--
Gitblit v1.9.3