Commit Graph

1603 Commits

Author SHA1 Message Date
1440ba821a Merge pull request 'master' (#809) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/809
2024-09-22 13:42:04 +00:00
e0b564c56c Merge pull request 'fix : 修复代理人回显' (#808) from de into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/808
2024-09-22 13:41:56 +00:00
158fbfd124 fix : 修复代理人回显 2024-09-22 21:41:46 +08:00
1a005f3b9e Merge pull request 'master' (#807) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/807
2024-09-22 13:40:04 +00:00
f1cc13ae71 Merge pull request 'fix : 修复个人中心代理人回显' (#806) from de into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/806
2024-09-22 13:39:57 +00:00
35ba4523e8 fix : 修复个人中心代理人回显 2024-09-22 21:39:48 +08:00
c8731e0612 Merge pull request 'master' (#805) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/805
2024-09-22 11:53:42 +00:00
30f74720b4 Merge pull request 'fix : 研发资金格式化' (#804) from de into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/804
2024-09-22 11:53:30 +00:00
9e9c4beb45 fix : 研发资金格式化 2024-09-22 19:53:20 +08:00
20798e0ce6 Merge pull request 'master' (#803) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/803
2024-09-22 10:46:42 +00:00
810479701c Merge pull request 'fix : 饼图间距' (#802) from de into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/802
2024-09-22 10:46:25 +00:00
b8392f199c fix : 饼图间距 2024-09-22 18:46:10 +08:00
9646a0110f Merge pull request 'master' (#801) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/801
2024-09-22 10:07:34 +00:00
11f887c93d Merge pull request 'fix : 移除首页待办模拟数据' (#800) from de into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/800
2024-09-22 10:07:24 +00:00
b539f4a6d7 fix : 移除首页待办模拟数据 2024-09-22 18:07:15 +08:00
216bc5034b Merge pull request 'master' (#799) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/799
2024-09-22 09:58:43 +00:00
cefee8298a Merge pull request 'de' (#798) from de into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/798
2024-09-22 09:58:32 +00:00
47633749fb feat : 审批记录的代理审批,用户管理的设置代理功能,首页待办 2024-09-22 17:58:13 +08:00
4e325196c8 feat : 个人中心和用户管理设置代理 2024-09-22 15:26:45 +08:00
18c5386fdd Merge pull request 'master' (#797) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/797
2024-09-22 04:22:34 +00:00
242fb1ddee Merge pull request 'fix : 修复首页适配/人员选择器取消功能bug' (#796) from de into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/796
2024-09-22 04:22:25 +00:00
2546db9b64 fix : 修复首页适配/人员选择器取消功能bug 2024-09-22 12:21:57 +08:00
b28fbaf903 Merge pull request 'master' (#795) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/795
2024-09-21 16:42:15 +00:00
58ffb22bf6 Merge pull request 'fix : 修复首页适配' (#794) from de into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/794
2024-09-21 16:42:04 +00:00
d7d825b5b0 fix : 修复首页适配 2024-09-22 00:40:40 +08:00
dc9f82f30e Merge pull request 'master' (#793) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/793
2024-09-21 16:31:33 +00:00
7077604a27 Merge pull request 'fix : 修复首页适配' (#792) from de into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/792
2024-09-21 16:31:12 +00:00
ea38a6ddef fix : 修复首页适配 2024-09-22 00:31:00 +08:00
bba7a8e456 Merge pull request 'master' (#791) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/791
2024-09-21 16:28:44 +00:00
4a620c5d78 Merge pull request 'de' (#790) from de into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/790
2024-09-21 16:28:36 +00:00
c37e150bb9 fix : 修复首页适配 2024-09-22 00:28:18 +08:00
fe45524d52 fix : 修复首页适配 2024-09-22 00:27:22 +08:00
5d21271316 Merge pull request 'master' (#789) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/789
2024-09-21 15:52:09 +00:00
9b78d4e52e Merge pull request 'fix : 修复首页数据展示' (#788) from de into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/788
2024-09-21 15:51:57 +00:00
349f514bcb fix : 修复首页数据展示 2024-09-21 23:51:33 +08:00
85a910b794 Merge pull request 'master' (#787) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/787
2024-09-21 14:38:43 +00:00
e4069c0de2 Merge pull request 'fix : 修复首页数据展示,更改文章时间字段' (#786) from de into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/786
2024-09-21 14:38:32 +00:00
7b155f649d fix : 修复首页数据展示,更改文章时间字段 2024-09-21 22:37:59 +08:00
ecc7b0ebc3 Merge pull request 'master' (#785) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/785
2024-09-21 13:59:36 +00:00
c6a8a6fc70 Merge pull request 'feat : 文章管理crud功能完成' (#784) from de into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/784
2024-09-21 13:59:26 +00:00
4f594b0bfd feat : 文章管理crud功能完成 2024-09-21 21:59:12 +08:00
f1a02e9188 Merge pull request 'master' (#783) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/783
2024-09-21 10:19:39 +00:00
f011a1e8fd Merge pull request 'feat : 研发投入资金crud功能完成' (#782) from de into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/782
2024-09-21 10:19:30 +00:00
090e9a1ea8 feat : 研发投入资金crud功能完成 2024-09-21 18:19:17 +08:00
fc8575dd0b Merge pull request 'master' (#781) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/781
2024-09-21 07:40:12 +00:00
f162befa0d Merge pull request 'feat : 研发投入资金和文章管理' (#780) from de into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/780
2024-09-21 07:40:01 +00:00
10bb9cbc37 feat : 研发投入资金和文章管理 2024-09-21 15:39:45 +08:00
52ca3791b3 Merge pull request 'master' (#779) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/779
2024-09-19 09:14:09 +00:00
2fe143b6c7 Merge pull request 'fix : 优化首页样式' (#778) from de into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/778
2024-09-19 09:13:52 +00:00
bbf63ec51f fix : 优化首页样式 2024-09-19 17:12:50 +08:00