Commit Graph

211 Commits

Author SHA1 Message Date
6b2a94453c Merge pull request 'master' (#119) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/119
2024-05-10 04:39:58 +00:00
1ee39bfa0c Merge pull request 'dj' (#118) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/118
2024-05-09 16:30:11 +00:00
371a55cfe1 fix : 完善页面细节 2024-05-10 00:29:07 +08:00
90de57698b feat : 需求征集新增/编辑/详情页面初始化 2024-05-10 00:28:40 +08:00
bd679710e2 Merge pull request 'master' (#117) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/117
2024-05-09 10:27:32 +00:00
858289ec0e Merge pull request 'fix :完善首页界面' (#116) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/116
2024-05-09 10:27:08 +00:00
bf6a683261 fix :完善首页界面 2024-05-09 18:26:40 +08:00
460dd793cf Merge pull request 'dj' (#115) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/115
2024-05-09 10:11:32 +00:00
be5150c7c4 feat: 初始化需求征集主页面 2024-05-09 18:11:11 +08:00
233f44990d Merge pull request 'master' (#114) from master into dj
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/114
2024-05-09 09:36:35 +00:00
wenhua
3403ca7ecb Merge pull request 'xqhz' (#113) from xqhz into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/113
2024-05-09 09:33:33 +00:00
lilinyuan
28b4637e01 feat: 初始化需求汇总主页面 2024-05-09 17:33:01 +08:00
lilinyuan
639caadc46 fix: 修复bug 2024-05-09 17:32:36 +08:00
lilinyuan
6557b5d2c8 fix: 修复bug 2024-05-09 17:32:21 +08:00
86610c07a8 Merge pull request 'master' (#112) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/112
2024-05-09 09:18:40 +00:00
4f6b2dcc27 Merge pull request 'feat : 新增首页界面' (#111) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/111
2024-05-09 09:17:30 +00:00
dcc6866211 feat : 新增首页界面 2024-05-09 17:16:39 +08:00
wenhua
0e0e1f9bb9 Merge pull request 'feat: 初始化项目需求目录及页面文件' (#110) from master into xqhz
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/110
2024-05-09 08:19:28 +00:00
lilinyuan
0e0d206cc7 feat: 初始化项目需求目录及页面文件 2024-05-09 16:14:48 +08:00
wenhua
bfe24e1207 Merge pull request 'role' (#109) from role into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/109
2024-05-09 07:30:12 +00:00
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