Commit Graph

170 Commits

Author SHA1 Message Date
zhangzhiqiang
1801eba0f4 menu 2022-12-25 23:37:47 +08:00
zhangzhiqiang
0c1b8f8a23 系统 菜单 2022-12-25 21:52:34 +08:00
zhangzhiqiang
5c05d39ee5 系统菜单 2022-12-25 21:51:25 +08:00
fff8ac4be7 去掉不要的文件 2022-12-20 15:41:38 +08:00
0d95485f97 存储管理 2022-12-20 15:24:44 +08:00
fb06fb3184 编码生成 2022-12-20 14:27:58 +08:00
zhangzhiqiang
1f103ddc39 user 2022-12-19 20:36:31 +08:00
zhangzhiqiang
da02fba0ae dept 2022-12-19 18:19:01 +08:00
zhangzhiqiang
06c385a086 user 2022-12-19 17:41:44 +08:00
2b57c787b5 部门权限与角色权限分配 2022-12-19 17:15:20 +08:00
zhangzhiqiang
4a2736219c dept 2022-12-19 16:08:28 +08:00
7daa0dfe94 任务调度js挪动 2022-12-19 16:05:41 +08:00
4f030630f1 任务调度 2022-12-19 16:03:23 +08:00
zhangzhiqiang
0073b50a8c mdf:部门页面 2022-12-19 14:58:58 +08:00
zhangzhiqiang
c56c24ed24 Merge remote-tracking branch 'origin/master' 2022-12-19 11:31:33 +08:00
zhangzhiqiang
6a0adbd175 query 2022-12-19 11:31:21 +08:00
024c66cf05 代码修改 2022-12-19 10:01:23 +08:00
zhangzhiqiang
b95befb91b Merge remote-tracking branch 'origin/master' 2022-12-19 09:23:35 +08:00
zhangzhiqiang
979e8d9380 mdf:用户页面维护 2022-12-19 09:23:24 +08:00
2822626c4f 代码更新 2022-12-19 09:17:37 +08:00
0a60c259f0 字典js移动位置 2022-12-17 16:56:04 +08:00
46f049f1c1 字典 2022-12-17 16:52:41 +08:00
87a8a0a416 去除角色菜单中间表mapper等信息 2022-12-16 21:51:49 +08:00
ludj
81f7d33e65 菜单代码更新 2022-12-16 18:08:17 +08:00
zhangzhiqiang
22ae7f3720 mdf:user 2022-12-16 18:06:55 +08:00
ludj
f1b69e8f90 菜单角色更新 2022-12-16 17:41:37 +08:00
ludj
40a319fb37 菜单功能修改 2022-12-16 17:12:51 +08:00
ludj
349c5d5f01 代码更新 2022-12-16 16:53:58 +08:00
69253369b8 代码更新 2022-12-16 16:52:14 +08:00
07ac1e1167 代码更新 2022-12-16 16:29:57 +08:00
52cc2c6b09 Merge branch 'master' of http://121.40.234.130:8899/root/nl-sso-server 2022-12-16 16:12:26 +08:00
db04de9f48 角色 2022-12-16 16:12:18 +08:00
zhangzhiqiang
e66104d3cf Merge remote-tracking branch 'origin/master' 2022-12-16 16:05:27 +08:00
zhangzhiqiang
d67b4fa21a add"userdept 2022-12-16 16:04:51 +08:00
ludj
44f63d0067 菜单功能修改 2022-12-16 15:04:19 +08:00
zhangzhiqiang
fcaa364c53 user 2022-12-16 15:03:23 +08:00
ludj
74105971e1 主键字段Long-->String 2022-12-16 14:53:03 +08:00
zhangzhiqiang
78cb2023a8 usersql 2022-12-16 14:35:53 +08:00
zhangzhiqiang
e3c3ca6dcc 1 2022-12-16 14:32:00 +08:00
71c20c1f6a Merge branch 'master' of http://121.40.234.130:8899/root/nl-sso-server 2022-12-16 14:23:36 +08:00
43a2a95e55 excel 2022-12-16 14:23:21 +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
7d8ac0debf Merge branch 'master' of http://121.40.234.130:8899/root/nl-sso-server 2022-12-16 14:14:51 +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
zhangzhiqiang
a9060bfb47 排序 2022-12-16 14:13:26 +08:00
ludj
59ec8e4356 代码更新 2022-12-16 14:10:58 +08:00