diff --git a/nladmin-system/nlsso-server/.gitignore b/nladmin-system/nlsso-server/.gitignore deleted file mode 100644 index 549e00a..0000000 --- a/nladmin-system/nlsso-server/.gitignore +++ /dev/null @@ -1,33 +0,0 @@ -HELP.md -target/ -!.mvn/wrapper/maven-wrapper.jar -!**/src/main/**/target/ -!**/src/test/**/target/ - -### STS ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans -.sts4-cache - -### IntelliJ IDEA ### -.idea -*.iws -*.iml -*.ipr - -### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ -build/ -!**/src/main/**/build/ -!**/src/test/**/build/ - -### VS Code ### -.vscode/ diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/SysUser.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/SysUser.java index 0590255..43ad9a6 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/SysUser.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/SysUser.java @@ -27,7 +27,7 @@ public class SysUser implements Serializable { /** * 用户标识 */ - @TableId(value = "user_id", type = IdType.INPUT) + @TableId(value = "user_id", type = IdType.NONE) private String userId; /** diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml index 7a4dd79..add2567 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml @@ -18,8 +18,8 @@ sys_user.create_id as createId, sys_user.create_name as createName, sys_user.create_time as createTime, - sys_user.update_optid as updateId, - sys_user.update_optname as updateName, + sys_user.update_id as updateId, + sys_user.update_name as updateName, sys_user.update_time as updateTime, sys_user.extperson_id as extpersonId, sys_user.extuser_id as extuserId @@ -41,8 +41,8 @@ - - + +