2191 Commits

Author SHA1 Message Date
lilinyuan
d2521765be Merge branch 'role' of http://git.feashow.cn/clay/mosr-web into role 2024-05-09 15:29:05 +08:00
lilinyuan
5c1b66b03d feat: 新增sidermenu首页项 2024-05-09 15:29:00 +08:00
clay
b336efa79c Merge pull request 'feat : 测试sso单点登录之后的重定向路径4' (#108) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/108
2024-04-29 03:50:07 +00:00
clay
2bb86ced15 feat : 测试sso单点登录之后的重定向路径4 2024-04-29 11:49:46 +08:00
clay
d010907d2b Merge pull request 'feat : 测试sso单点登录之后的重定向路径3' (#107) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/107
2024-04-29 03:28:30 +00:00
clay
929228974a feat : 测试sso单点登录之后的重定向路径3 2024-04-29 11:27:56 +08:00
clay
894b656a82 Merge pull request 'feat : 测试sso单点登录之后的重定向路径' (#106) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/106
2024-04-29 02:31:44 +00:00
clay
eee3c3852e feat : 测试sso单点登录之后的重定向路径 2024-04-29 10:31:18 +08:00
clay
4b9ecb9360 Merge pull request 'feat : 测试sso单点登录之后的重定向路径' (#105) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/105
2024-04-29 02:22:08 +00:00
clay
57bfb6f4a0 feat : 测试sso单点登录之后的重定向路径 2024-04-29 10:20:58 +08:00
clay
228fef7a9b Merge pull request 'feat : 测试sso单点登录之后的重定向路径' (#104) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/104
2024-04-29 02:11:08 +00:00
clay
5d3ab890f3 feat : 测试sso单点登录之后的重定向路径 2024-04-29 10:10:50 +08:00
clay
6a6a440428 Merge pull request 'master' (#103) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/103
2024-04-29 02:04:25 +00:00
clay
3eecc3f4b9 Merge pull request 'role' (#102) from role into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/102
2024-04-29 02:04:03 +00:00
clay
29ea0d5fe4 feat : 测试sso单点登录之后的重定向路径 2024-04-29 10:03:46 +08:00
lilinyuan
8c1d2eeabe feat: 新增登录重定向之前被拦截的页面 2024-04-29 09:58:18 +08:00
wenhua
ee9462769f Merge pull request 'master' (#101) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/101
2024-04-01 07:31:41 +00:00
wenhua
9217f019e5 Merge pull request 'fix: 按钮逻辑' (#100) from role into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/100
2024-04-01 07:31:24 +00:00
lilinyuan
24dfaac98a fix: 按钮逻辑 2024-04-01 15:30:56 +08:00
wenhua
cf2f071f6d Merge pull request 'master' (#99) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/99
2024-04-01 07:09:01 +00:00
wenhua
26b50d6103 Merge pull request 'fix: 调整菜单权限按钮' (#98) from role into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/98
2024-04-01 07:08:40 +00:00
lilinyuan
b5acea2e47 fix: 调整菜单权限按钮 2024-04-01 15:02:09 +08:00
wenhua
18113da288 Merge pull request 'master' (#97) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/97
2024-04-01 06:36:54 +00:00
wenhua
12053b81b9 Merge pull request 'role' (#96) from role into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/96
2024-04-01 06:36:33 +00:00
lilinyuan
39bc3011dd fix: 去掉操作列悬浮 2024-04-01 14:36:02 +08:00
lilinyuan
6e42dd43f7 fix: 组件调整 2024-04-01 14:28:08 +08:00
lilinyuan
1b10b9aa2b fix: 角色管理调整 2024-04-01 14:27:52 +08:00
lilinyuan
8964cbe4bd fix: 注释install 2024-04-01 13:58:03 +08:00
wenhua
743f55c11d Merge pull request 'master' (#95) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/95
2024-04-01 05:49:16 +00:00
wenhua
360f0dd92d Merge pull request 'fix: 修改依赖源地址' (#94) from role into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/94
2024-04-01 05:48:54 +00:00
lilinyuan
de971d224e fix: 修改依赖源地址 2024-04-01 13:48:34 +08:00
wenhua
4009f05185 Merge pull request 'master' (#93) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/93
2024-04-01 05:42:12 +00:00
wenhua
68c4ca5dc9 Merge pull request 'fix: 修改依赖源' (#92) from role into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/92
2024-04-01 05:41:49 +00:00
lilinyuan
5977480404 fix: 修改依赖源 2024-04-01 13:41:23 +08:00
wenhua
182572bfd1 Merge pull request 'master' (#91) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/91
2024-04-01 03:28:44 +00:00
wenhua
8f922a8815 Merge pull request 'role' (#90) from role into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/90
2024-04-01 03:28:24 +00:00
lilinyuan
508e391823 feat: 恢复 2024-04-01 11:27:06 +08:00
lilinyuan
2560ed701f fix: 暂时删除 2024-04-01 11:25:27 +08:00
lilinyuan
9123149565 feat: up dependencies 2024-04-01 11:23:51 +08:00
lilinyuan
f1e1def32c feat: up dependencies 2024-04-01 11:20:55 +08:00
wenhua
5edd4ee722 Merge pull request 'master' (#86) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/86
2024-04-01 03:00:53 +00:00
wenhua
c3e582ad33 Merge pull request 'feat: up' (#85) from role into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/85
2024-04-01 03:00:32 +00:00
lilinyuan
e787128011 feat: up 2024-04-01 11:00:10 +08:00
wenhua
497f1ad64e Merge pull request 'master' (#84) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/84
2024-04-01 02:21:19 +00:00
wenhua
fde73bd7b0 Merge pull request 'fix: 再试一次' (#83) from role into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/83
2024-04-01 02:20:57 +00:00
lilinyuan
90f6bd344e fix: 再试一次 2024-04-01 10:20:32 +08:00
wenhua
ff632ef4cf Merge pull request 'master' (#82) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/82
2024-04-01 02:14:40 +00:00
wenhua
ef46911a5b Merge pull request 'fix: 使用原始ui库' (#81) from role into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/81
2024-04-01 02:14:17 +00:00
lilinyuan
ffc5600b9b fix: 使用原始ui库 2024-04-01 10:13:53 +08:00
wenhua
10d094a5b7 Merge pull request 'master' (#79) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/79
2024-04-01 01:53:35 +00:00