Commit Graph

53 Commits

Author SHA1 Message Date
zhangzhiqiang
d67b4fa21a add"userdept 2022-12-16 16:04:51 +08:00
zhangzhiqiang
fcaa364c53 user 2022-12-16 15:03:23 +08:00
zhangzhiqiang
040734cd92 替换opt 2022-12-16 14:22:34 +08:00
ludj
867872fec6 Merge branch 'master' of http://121.40.234.130:8899/root/nl-sso-server 2022-12-16 14:17:14 +08:00
ludj
4ebbc73653 删除前端WMS 2022-12-16 14:17:03 +08:00
52117f32b6 角色 2022-12-16 14:16:43 +08:00
ee0eaacc2d 角色管理 2022-12-16 14:15:19 +08:00
ludj
748b21dd51 Merge branch 'master' of http://121.40.234.130:8899/root/nl-sso-server
# Conflicts:
#	nladmin-system/nlsso-server/src/main/java/org/nl/modules/common/base/BaseDTO.java
#	nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.java
2022-12-16 14:14:28 +08:00
ludj
59ec8e4356 代码更新 2022-12-16 14:10:58 +08:00
zhangzhiqiang
95ead132ba mdf:uservue 2022-12-16 11:32:05 +08:00
zhangzhiqiang
02d1fadaff user 2022-12-15 19:11:10 +08:00
zhangzhiqiang
307f72b131 Merge remote-tracking branch 'origin/master' 2022-12-15 19:08:35 +08:00
zhangzhiqiang
5a17c4bced user 2022-12-15 19:08:29 +08:00
3a45833ac9 crud.js 2022-12-15 19:07:43 +08:00
zhangzhiqiang
08883f074b dept 2022-12-15 19:06:24 +08:00
zhangzhiqiang
1f7b20f2e9 user 2022-12-15 19:05:41 +08:00
8e5c5e1890 1 2022-12-15 19:02:21 +08:00
6790b8cefc 代码更新 2022-12-15 18:43:00 +08:00
ludj
88324f26fd 菜单角色修改 2022-12-15 17:04:42 +08:00
b1cea13823 api.js 2022-12-14 19:37:36 +08:00
zhangzhiqiang
3dc5a67ddf add:依赖mybatisplus 2022-12-14 15:47:52 +08:00
16ac69ace9 文件存储 2022-12-06 14:53:22 +08:00
39c5476959 Merge branch 'master' of http://121.40.234.130:8899/root/nl-sso-server 2022-12-05 19:16:01 +08:00
4fe319de45 任务调度 2022-12-05 19:15:43 +08:00
zhangzhiqiang
b7d76da855 前端跳转 2022-12-05 14:55:21 +08:00
ludj
8d182add61 角色修改&&去除缓存 2022-12-05 14:38:16 +08:00
7c3f1075be 代码生成 2022-12-03 17:07:30 +08:00
ludj
d004edc77d Merge branch 'master' of http://121.40.234.130:8899/root/nl-sso-server 2022-12-02 17:16:31 +08:00
ludj
1840ceec58 代码更新 2022-12-02 17:16:27 +08:00
zhangzhiqiang
05457c0904 fix:用户页面(todo:角色,部门,数据分配) 2022-12-02 15:58:06 +08:00
zhangzhiqiang
06cd3b453c 用户 2022-12-02 15:39:16 +08:00
zhangzhiqiang
3c69896a03 fix部门页面finish 2022-12-02 13:37:23 +08:00
b349bf1083 修复页面刷新 2022-12-02 10:09:15 +08:00
zhangzhiqiang
2c76124f03 fix部门页面 2022-12-02 09:49:21 +08:00
5573b0c02b 修复用户昵称显示与登录跳转问题 2022-12-01 17:30:26 +08:00
2e1b5ce5ac 字典修改 2022-12-01 16:31:07 +08:00
zhangzhiqiang
e4bda3cc41 fix:部门管理列表 2022-12-01 16:24:44 +08:00
zhangzhiqiang
8781a99152 mdf:用户,部门去jpa2 2022-12-01 10:12:54 +08:00
zhangzhiqiang
e306540bb8 添加部门树 2022-12-01 08:51:50 +08:00
47db877b0a 字典修改 2022-11-30 19:34:52 +08:00
ludj
ba2c3606a6 Merge branch 'master' of http://121.40.234.130:8899/root/nl-sso-server
# Conflicts:
#	nladmin-ui/src/views/system/user/index.vue
2022-11-30 19:19:05 +08:00
ludj
66aaa6f2b8 角色菜单更新 2022-11-30 19:18:35 +08:00
zhangzhiqiang
df996c5eef 用户列表修改 2022-11-30 18:52:58 +08:00
ludj
11c5d63a7e 菜单修改 2022-11-30 16:39:26 +08:00
zhangzhiqiang
995f192ff2 1 2022-11-30 16:28:29 +08:00
ludj
3cdefdd4d8 菜单更新 2022-11-30 16:26:44 +08:00
zhangzhiqiang
fd5b644be1 mdf:用户,部门去jpa2 2022-11-30 15:09:06 +08:00
ludj
fb28f2a7f4 菜单角色更新 2022-11-30 14:52:48 +08:00
ludj
dc2bcc17eb 菜单功能更新 2022-11-30 13:16:03 +08:00
ludj
9a271d0f79 代码更新 2022-11-30 11:31:14 +08:00