From 2b7c28ad67a8aabdc2fe8a06db5fb9bbc83d9b70 Mon Sep 17 00:00:00 2001
From: cjw <miko20001@163.com>
Date: Tue, 30 Apr 2024 16:43:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=91=E5=B8=83=E7=A9=BA?=
 =?UTF-8?q?=E6=8C=87=E9=92=88bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/dromara/scale/domain/bo/SysScalePublishBo.java    | 6 +++---
 .../dromara/system/domain/vo/SysUserPassWordExportVo.java | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

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<String> 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<String> 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<String> 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;