12.3

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/StudentExportExcelVO.java

@@ -27,6 +27,10 @@ public class StudentExportExcelVO {
     @ExcelProperty("姓名")
     private String nickname;
 
+    @ExcelProperty(value = "用户性别", converter = DictConvert.class)
+    @DictFormat(DictTypeConstants.USER_SEX)
+    private Integer sex;
+
     @ExcelProperty("年级")
     private String grade;
 
@@ -39,10 +43,6 @@ public class StudentExportExcelVO {
     @ExcelProperty("硕士类型")
     private String masterType;
 
-    @ExcelProperty(value = "用户性别", converter = DictConvert.class)
-    @DictFormat(DictTypeConstants.USER_SEX)
-    private Integer sex;
-
     @ExcelIgnore
     private String userType;
 

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/StudentImportExcelVO.java

@@ -49,7 +49,7 @@ public class StudentImportExcelVO {
     @ExcelIgnore
     private String userType;
 
-    @ExcelProperty("用户邮箱")
+    @ExcelProperty("邮箱")
     private String email;
 
     @ExcelProperty("手机号码")

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/graduateStudentExportExcelVO.java

@@ -21,10 +21,10 @@ import lombok.experimental.Accessors;
 @Accessors(chain = false) // 设置 chain = false，避免用户导入有问题
 public class graduateStudentExportExcelVO {
 
-    @ExcelProperty("用户名称")
+    @ExcelProperty("姓名")
     private String nickname;
 
-    @ExcelProperty(value = "用户性别", converter = DictConvert.class)
+    @ExcelProperty(value = "性别", converter = DictConvert.class)
     @DictFormat(DictTypeConstants.USER_SEX)
     private Integer sex;
 
@@ -40,12 +40,13 @@ public class graduateStudentExportExcelVO {
     @ExcelProperty("学号")
     private String userNumber;
 
-    @ExcelProperty("用户邮箱")
-    private String email;
-
     @ExcelProperty("手机号码")
     private String mobile;
 
+    @ExcelProperty("邮箱")
+    private String email;
+
+
     @ExcelProperty("工作地点")
     private String workPlace;
 

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/graduateStudentImportExcelVO.java

@@ -29,10 +29,10 @@ public class graduateStudentImportExcelVO {
     @ExcelIgnore
     private String password;
 
-    @ExcelProperty("用户名称")
+    @ExcelProperty("姓名")
     private String nickname;
 
-    @ExcelProperty(value = "用户性别", converter = DictConvert.class)
+    @ExcelProperty(value = "性别", converter = DictConvert.class)
     @DictFormat(DictTypeConstants.USER_SEX)
     private Integer sex;
 
@@ -48,7 +48,7 @@ public class graduateStudentImportExcelVO {
     @ExcelProperty("学号")
     private String userNumber;
 
-    @ExcelProperty("用户邮箱")
+    @ExcelProperty("邮箱")
     private String email;
 
     @ExcelProperty("手机号码")
@@ -60,7 +60,7 @@ public class graduateStudentImportExcelVO {
     @ExcelProperty("工作地点")
     private String workPlace;
 
-    @ExcelProperty("导师名称(导师添加时不用填)")
+    @ExcelProperty("导师名称(导师添加时可不用填)")
     private String supervisor;
 
 //    @ExcelProperty(value = "账号状态", converter = DictConvert.class)

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/teacherExportExcelVO.java

@@ -24,20 +24,20 @@ public class teacherExportExcelVO {
     @ExcelProperty("登录账号")
     private String username;
 
-    @ExcelProperty("用户名称")
+    @ExcelProperty("姓名")
     private String nickname;
 
-    @ExcelProperty("导师工号")
+    @ExcelProperty("工号")
     private String userNumber;
 
-    @ExcelProperty(value = "用户性别", converter = DictConvert.class)
+    @ExcelProperty(value = "性别", converter = DictConvert.class)
     @DictFormat(DictTypeConstants.USER_SEX)
     private Integer sex;
 
     @ExcelProperty("手机号码")
     private String mobile;
 
-    @ExcelProperty("用户邮箱")
+    @ExcelProperty("邮箱")
     private String email;
 
     @ExcelProperty("工作间名称")

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/vo/user/teacherImportExcelVO.java

@@ -30,23 +30,24 @@ public class teacherImportExcelVO {
     @ExcelProperty("登录密码")
     private String password;
 
-    @ExcelProperty("用户名称")
+    @ExcelProperty("姓名")
     private String nickname;
 
-    @ExcelProperty("导师工号")
-    private String userNumber;
-
-    @ExcelProperty(value = "用户性别", converter = DictConvert.class)
+    @ExcelProperty(value = "性别", converter = DictConvert.class)
     @DictFormat(DictTypeConstants.USER_SEX)
     private Integer sex;
 
+    @ExcelProperty("工号")
+    private String userNumber;
+
+
     @ExcelProperty("手机号码")
     private String mobile;
 
     @ExcelIgnore
     private  String userType;
 
-    @ExcelProperty("用户邮箱")
+    @ExcelProperty("邮箱")
     private String email;
 
     @ExcelProperty("工作间名称")