fix bug 40240 用户管理--导出--列表与字段顺序不对
bug 40243 用户管理--导入--唯一性验证--提示语不对
This commit is contained in:
+1
-1
@@ -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<SysUser> wrapper1 = new LambdaQueryWrapper<>();
|
||||
wrapper1.eq(SysUser::getPhone,sysUser.getPhone());
|
||||
|
||||
@@ -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;
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user