Commit Graph

59 Commits

Author SHA1 Message Date
zhangzhiqiang
8867d3fee6 用户分页查询 2022-12-02 16:13: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
ludj
f8f2af2f55 代码更新 2022-12-02 11:08:08 +08:00
b349bf1083 修复页面刷新 2022-12-02 10:09:15 +08:00
zhangzhiqiang
2c76124f03 fix部门页面 2022-12-02 09:49:21 +08:00
bb69a505d9 字典更新 2022-12-01 20:14:52 +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
8bc9086cd1 Merge branch 'master' of http://121.40.234.130:8899/root/nl-sso-server 2022-12-01 10:42:50 +08:00
e58cb8ae34 修复菜单图标 2022-12-01 10:41:46 +08:00
zhangzhiqiang
8781a99152 mdf:用户,部门去jpa2 2022-12-01 10:12:54 +08:00
zhangzhiqiang
e306540bb8 添加部门树 2022-12-01 08:51:50 +08:00
f0c119865d 代码修改 2022-11-30 20:17:43 +08:00
ludj
44df223524 字典表更新 2022-11-30 20:11:11 +08:00
ludj
0425879acd Merge branch 'master' of http://121.40.234.130:8899/root/nl-sso-server 2022-11-30 20:09:44 +08:00
ludj
4dc5d6fb0b 去掉JPA 2022-11-30 20:09:39 +08:00
7708f7b319 代码修改 2022-11-30 20:06:07 +08:00
d5a3d84b74 字典表数据获取 2022-11-30 19:55:52 +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
4004f6d4df 菜单更新 2022-11-30 17:06:15 +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
ludj
67a4def2cc Merge branch 'master' of http://121.40.234.130:8899/root/nl-sso-server 2022-11-30 15:36:55 +08:00
ludj
135c93413c 代码更新 2022-11-30 15:36:43 +08:00
zhangzhiqiang
fd5b644be1 mdf:用户,部门去jpa2 2022-11-30 15:09:06 +08:00
zhangzhiqiang
d054ae574b mdf:用户,部门去jpa2 2022-11-30 15:04:48 +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
zhangzhiqiang
29c3a937f3 mdf:baseentity对象映射修改 2022-11-30 11:20:15 +08:00
ludj
35c296996f 菜单功能修改 2022-11-30 11:08:08 +08:00
lyd
4fe3925f8c 字典 2022-11-30 11:04:18 +08:00
zhangzhiqiang
8b290563ee Merge remote-tracking branch 'origin/master' 2022-11-30 10:53:21 +08:00
zhangzhiqiang
57598d4d8e mdf:剔除qz启动,基础do兼容jpa 2022-11-30 10:53:15 +08:00
lyd
fe968d4dc8 实体修改 2022-11-30 10:44:51 +08:00
lyd
4e2e254e67 暂存 2022-11-30 10:40:11 +08:00
zhangzhiqiang
839863ade9 mdf:用户,部门去jpa2 2022-11-30 10:38:50 +08:00
zhangzhiqiang
99d78828a1 mdf:用户,部门去jpa 2022-11-30 10:19:18 +08:00
zhangzhiqiang
7f395f4ae6 用户,部门去jpa 2022-11-30 09:34:11 +08:00
zhangzhiqiang
fcbc2e81c0 用户去jpa 2022-11-29 20:33:53 +08:00
zhangzhiqiang
71c7c56b71 Merge remote-tracking branch 'origin/master' 2022-11-29 20:00:44 +08:00
zhangzhiqiang
e63551f75a 用户,部门去jpa 2022-11-29 20:00:13 +08:00
ludj
0a8f6e1224 代码更新 2022-11-29 19:28:39 +08:00