update

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/excel/UserExportDto.java

@@ -16,7 +16,7 @@ public class UserExportDto implements Serializable {
 
     @ApiModelProperty(name = "姓名")
     @ExcelProperty(name = "姓名", width = 30, index = 1)
-    String name;
+    String realName;
 
     @ApiModelProperty(name = "登录名")
     @ExcelProperty(name = "登录名", width = 30, index = 2)
@@ -42,12 +42,12 @@ public class UserExportDto implements Serializable {
     @ExcelProperty(name = "执行人", width = 30, index = 8)
     String updateName;
 
-    public String getName() {
-        return name;
+    public String getRealName() {
+        return realName;
     }
 
-    public void setName(String name) {
-        this.name = name;
+    public void setRealName(String realName) {
+        this.realName = realName;
     }
 
     public String getLoginName() {

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/excel/UserImportDto.java

@@ -19,7 +19,7 @@ public class UserImportDto implements Serializable {
     @NotNull
     @ExcelNote(value = "姓名")
     @ApiModelProperty(value = "姓名")
-    String name;
+    String realName;
 
     @NotNull
     @ExcelNote(value = "登录名")
@@ -55,12 +55,12 @@ public class UserImportDto implements Serializable {
         this.sysRole = sysRole;
     }
 
-    public String getName() {
-        return name;
+    public String getRealName() {
+        return realName;
     }
 
-    public void setName(String name) {
-        this.name = name;
+    public void setRealName(String realName) {
+        this.realName = realName;
     }
 
     public String getLoginName() {

distributed-print-task/src/main/java/com/qmth/distributed/print/task/templete/execute/AsyncUserImportTempleteService.java

@@ -86,7 +86,7 @@ public class AsyncUserImportTempleteService extends AsyncImportTaskTemplete {
                         } else if (userImportDto.getPassword().length() > 30) {
                             excelErrorTemp.add(new ExcelError(y + 1, "excel第" + (i + 1) + "个sheet第" + (y + 1) + "行[密码]不能大于30位"));
                         }
-                        if (userImportDto.getName().length() > 25) {
+                        if (userImportDto.getRealName().length() > 25) {
                             excelErrorTemp.add(new ExcelError(y + 1, "excel第" + (i + 1) + "个sheet第" + (y + 1) + "行[姓名]不能超过25个字符"));
                         }
                         if (userImportDto.getLoginName().length() > 25) {

distributed-print-task/src/main/java/com/qmth/distributed/print/task/templete/execute/UserImportTempleteService.java

@@ -78,7 +78,7 @@ public class UserImportTempleteService implements SyncImportTaskTemplete, Serial
                     } else if (userImportDto.getPassword().length() > 30) {
                         excelErrorTemp.add(new ExcelError(y + 1, "excel第" + (i + 1) + "个sheet第" + (y + 1) + "行[密码]不能大于30位"));
                     }
-                    if (userImportDto.getName().length() > 25) {
+                    if (userImportDto.getRealName().length() > 25) {
                         excelErrorTemp.add(new ExcelError(y + 1, "excel第" + (i + 1) + "个sheet第" + (y + 1) + "行[姓名]不能超过25个字符"));
                     }
                     if (userImportDto.getLoginName().length() > 25) {