From f098ef3c54f918fbb2e84179c1551a2ff129d362 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 21 Oct 2021 15:22:25 +0800 Subject: [PATCH] =?UTF-8?q?fix=20bug=2041192=20=E4=B8=8B=E8=BD=BD=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF--=E7=94=A8=E6=88=B7=E5=AF=BC=E5=85=A5=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E6=96=87=E4=BB=B6=EF=BC=8C=E2=80=99=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E5=8F=B7=E2=80=98=E5=AD=97=E6=AE=B5=E4=B8=8E=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E4=B8=8D=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/modules/system/controller/SysUserController.java | 2 +- .../src/main/java/com/jero/modules/system/entity/SysUser.java | 4 ++-- .../main/java/com/jero/modules/system/vo/SysUserTemplate.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java index 281ca5eb..af22bd65 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java @@ -789,7 +789,7 @@ public class SysUserController { wrapper1.eq(SysUser::getDelFlag,0); if (sysUserService.count(wrapper1)>0) { errorLines++; - errorMessage.add("第 " + lineNumber + " 行：手机号已经存在"); + errorMessage.add("第 " + lineNumber + " 行：手机号码已经存在"); } LambdaQueryWrapper wrapper2 = new LambdaQueryWrapper<>(); wrapper2.eq(SysUser::getEmail,sysUser.getEmail()); diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java index b1b562bc..1e764212 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java @@ -99,8 +99,8 @@ public class SysUser implements Serializable { /** * 电话 */ - @Excel(name = "手机号", width = 15) - @NotBlank(message = "手机号不能为空") + @Excel(name = "手机号码", width = 15) + @NotBlank(message = "手机号码不能为空") @Pattern(regexp = "^((13[0-9])|(14[579])|(15([0-3]|[5-9]))|(17[0135678])|(18[0-9])|(19[8|9])|(16[6]))\\d{8}$",message = "手机号码格式错误") private String phone; diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/vo/SysUserTemplate.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/vo/SysUserTemplate.java index 9285cad1..61597d85 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/vo/SysUserTemplate.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/vo/SysUserTemplate.java @@ -32,7 +32,7 @@ public class SysUserTemplate { /** * 电话 */ - @Excel(name = "手机号", width = 15) + @Excel(name = "手机号码", width = 15) @NotBlank(message = "手机号不能为空！") @Pattern(regexp = "^((13[0-9])|(14[579])|(15([0-3]|[5-9]))|(17[0135678])|(18[0-9])|(19[8|9])|(16[6]))\\d{8}$",message = "手机号码格式错误") private String phone;