diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScalePublishBo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScalePublishBo.java index a2f589c..c50fa27 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScalePublishBo.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScalePublishBo.java @@ -33,7 +33,7 @@ public class SysScalePublishBo { * 量表id,以逗号隔开 */ @NotEmpty(message = "量表id,以逗号隔开不能为空", groups = {AddGroup.class, EditGroup.class}) - @AutoMapping(target = "scaleIds", expression = "java(java.lang.String.join(\",\", source.getScaleIds()))") + @AutoMapping(target = "scaleIds", expression = "java(cn.hutool.core.util.StrUtil.join(\",\", source.getScaleIds()))") private List scaleIds; private String scaleNames; @@ -43,11 +43,11 @@ public class SysScalePublishBo { @NotBlank(message = "场次名称不能为空", groups = {AddGroup.class, EditGroup.class}) private String sessionName; - @AutoMapping(target = "deptIds", expression = "java(java.lang.String.join(\",\", source.getDeptIds()))") + @AutoMapping(target = "deptIds", expression = "java(cn.hutool.core.util.StrUtil.join(\",\", source.getDeptIds()))") private List deptIds; private String deptNames; - @AutoMapping(target = "userIds", expression = "java(java.lang.String.join(\",\", source.getUserIds()))") + @AutoMapping(target = "userIds", expression = "java(cn.hutool.core.util.StrUtil.join(\",\", source.getUserIds()))") private List userIds; private String userNames; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserPassWordExportVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserPassWordExportVo.java index 337dd5e..8f0eef0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserPassWordExportVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserPassWordExportVo.java @@ -26,25 +26,25 @@ public class SysUserPassWordExportVo implements Serializable { /** * 分组名称 */ - @ExcelProperty(value = "分组名称") + @ExcelProperty(value = "班级") private String deptName; /** * 用户昵称 */ - @ExcelProperty(value = "用户名称") + @ExcelProperty(value = "用户姓名") private String nickName; /** * 用户账号 */ - @ExcelProperty(value = "登录名称") + @ExcelProperty(value = "登录账号") private String userName; /** * 用户密码 */ - @ExcelProperty(value = "用户密码") + @ExcelProperty(value = "登录密码") private String password;