2191 Commits

Author SHA1 Message Date
wenhua
b1b039a897 Merge pull request 'master' (#47) from master into uesr
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/47
2024-03-29 06:09:34 +00:00
wenhua
eb5b27fdf8 Merge pull request 'master' (#46) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/46
2024-03-29 06:07:55 +00:00
wenhua
1e23fe08e3 Merge pull request 'fix: 修复role新增编辑bug, 调整列表页' (#45) from role into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/45
2024-03-29 06:07:24 +00:00
lilinyuan
47a4c311af fix: 修复role新增编辑bug, 调整列表页 2024-03-29 14:06:47 +08:00
wenhua
e8ab5fc050 Merge pull request 'master' (#44) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/44
2024-03-28 08:43:11 +00:00
wenhua
5fc036d12d Merge pull request 'role' (#43) from role into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/43
2024-03-28 08:42:48 +00:00
lilinyuan
51cf038bed feat: 角色crud对接完成 2024-03-28 16:41:22 +08:00
lilinyuan
c412b8652d fix: tablelayout 改为auto 2024-03-28 16:40:48 +08:00
wenhua
9df7674abc Merge pull request 'master' (#42) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/42
2024-03-28 01:34:34 +00:00
wenhua
610b1a66b6 Merge pull request 'role' (#41) from role into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/41
2024-03-28 01:32:17 +00:00
lilinyuan
e8270fbe0b fix: 重构role 2024-03-27 17:30:52 +08:00
lilinyuan
46765952e5 fix: 修复路由bug 2024-03-27 17:30:29 +08:00
wenhua
21517a41a3 Merge pull request 'master' (#40) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/40
2024-03-27 06:22:52 +00:00
wenhua
4eff7d3751 Merge pull request 'uesr' (#39) from uesr into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/39
2024-03-27 06:22:28 +00:00
lilinyuan
a22d80710b fix: 调整user列表编辑删除按钮显示 2024-03-27 14:20:50 +08:00
lilinyuan
e1f5c48a6e fix: 优化user新增修改 2024-03-27 14:20:23 +08:00
wenhua
4449fcce60 Merge pull request 'master' (#38) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/38
2024-03-26 08:32:54 +00:00
wenhua
73f5c4d493 Merge pull request 'uesr' (#37) from uesr into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/37
2024-03-26 08:32:30 +00:00
lilinyuan
462c2e2110 feat: 完成user新增编辑详情接口对接 2024-03-26 16:31:16 +08:00
lilinyuan
f782587b79 feat: 添加公共组件title 2024-03-26 16:30:53 +08:00
lilinyuan
103b24fdb3 fix: 调整tagsViewvue文件 2024-03-26 16:30:33 +08:00
lilinyuan
03b9eae07d fix: 删除自定义指令consolelog 2024-03-26 16:30:13 +08:00
lilinyuan
ed0d51d47d fix: 调整组件 2024-03-26 16:29:09 +08:00
lilinyuan
82947fe5b6 fix: 调整tagsView文件 2024-03-26 16:28:46 +08:00
lilinyuan
eda3b43e73 fix: 样式调整 2024-03-26 16:28:15 +08:00
27c7b68595 Merge pull request 'master' (#36) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/36
2024-03-26 07:03:41 +00:00
08edc44670 Merge pull request 'fix : 细节优化' (#35) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/35
2024-03-26 06:47:51 +00:00
45f95fa297 fix : 细节优化 2024-03-26 14:37:38 +08:00
306f92f4e5 Merge pull request 'master' (#34) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/34
2024-03-25 14:41:50 +00:00
203180100e Merge pull request 'fix : 细节优化' (#33) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/33
2024-03-25 14:41:39 +00:00
60f3c41124 fix : 细节优化 2024-03-25 22:41:23 +08:00
51fe4e113b Merge pull request 'master' (#32) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/32
2024-03-25 14:39:51 +00:00
2b5bec709d Merge pull request 'fix : 细节优化' (#31) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/31
2024-03-25 14:39:38 +00:00
5d31b52e67 fix : 细节优化 2024-03-25 22:39:25 +08:00
3bb0b9108c Merge pull request 'master' (#30) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/30
2024-03-25 12:42:35 +00:00
1278e8bef5 Merge pull request 'fix : 修复流程框点击bug' (#29) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/29
2024-03-25 12:42:25 +00:00
f646c13e9d fix : 修复流程框点击bug 2024-03-25 20:41:51 +08:00
b8aff8512d Merge pull request 'master' (#28) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/28
2024-03-25 10:01:07 +00:00
9fdacf9916 Merge pull request 'fix : 修复bug' (#27) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/27
2024-03-25 10:00:54 +00:00
4d82ec56ea fix : 修复bug 2024-03-25 18:00:32 +08:00
6ec24f7431 Merge pull request 'master' (#26) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/26
2024-03-25 09:09:50 +00:00
4370687945 Merge pull request 'fix : 修复工作流流程新增bug' (#25) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/25
2024-03-25 09:09:31 +00:00
1c93a97d58 fix : 修复工作流流程新增bug 2024-03-25 17:08:48 +08:00
wenhua
d4373bc44f Merge pull request 'master' (#24) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/24
2024-03-25 02:57:52 +00:00
wenhua
5cdfa2d7cf Merge pull request 'fix: 修改整体样式' (#23) from uesr into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/23
2024-03-25 02:57:28 +00:00
lilinyuan
340ec0161d fix: 修改整体样式 2024-03-25 10:56:50 +08:00
wenhua
d0c20d68eb Merge pull request 'master' (#22) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/22
2024-03-24 15:05:37 +00:00
wenhua
7b707f4ff3 Merge pull request 'uesr' (#21) from uesr into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/21
2024-03-24 15:05:04 +00:00
lilinyuan
3efca32dbf feat: 新增页面缓存 2024-03-24 23:00:34 +08:00
lilinyuan
365c4c9d69 feat: 添加路由参数 2024-03-24 23:00:09 +08:00