From 510fc592bb55d4e63504008d8ab3a06c6fe2e7a1 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 21 Oct 2021 15:16:19 +0800 Subject: [PATCH] =?UTF-8?q?fix=20bug=2040240=20=E7=94=A8=E6=88=B7=E7=AE=A1?= =?UTF-8?q?=E7=90=86--=E5=AF=BC=E5=87=BA--=E5=88=97=E8=A1=A8=E4=B8=8E?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E9=A1=BA=E5=BA=8F=E4=B8=8D=E5=AF=B9=20bug=20?= =?UTF-8?q?40243=20=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86--=E5=AF=BC?= =?UTF-8?q?=E5=85=A5--=E5=94=AF=E4=B8=80=E6=80=A7=E9=AA=8C=E8=AF=81--?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=AD=E4=B8=8D=E5=AF=B9?= 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 | 2 +- 2 files changed, 2 insertions(+), 2 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 6eec25fb..3099d00b 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 @@ -782,7 +782,7 @@ public class SysUserController { wrapper.eq(SysUser::getDelFlag,0); if (sysUserService.count(wrapper)>0) { errorLines++; - errorMessage.add("第 " + lineNumber + " 行：用户名已经存在"); + errorMessage.add("第 " + lineNumber + " 行：用户账号已经存在"); } LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); wrapper1.eq(SysUser::getPhone,sysUser.getPhone()); 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 7c52131a..b1b562bc 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 @@ -171,7 +171,7 @@ public class SysUser implements Serializable { */ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(name = "创建时间", orderNum = "1",format = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "创建时间",format = "yyyy-MM-dd HH:mm:ss") private Date createTime; /**