odjbin/mosr-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,628 Commits 11 Branches 0 Tags
f588695f3c17cc4feb1ed17c4048fb00d1f10e04
Commit Graph

1628 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
odjbin
f588695f3c Merge pull request 'master' (#823) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/823
 2024-10-11 07:01:13 +00:00
odjbin
26ba628cae Merge pull request 'dj' (#822) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/822
 2024-10-11 07:00:58 +00:00
odjbin
7fbc2037d3 feat : 研发投入资金管理按钮权限 2024-10-11 15:00:42 +08:00
odjbin
5c1a1d507a feat : 首页专项资金项目数据展示 2024-10-11 14:49:18 +08:00
odjbin
ee2ddfca14 Merge pull request 'fix : 修复popover删除组件按钮显示问题' (#821) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/821
 2024-10-11 06:27:11 +00:00
odjbin
c456c6f642 fix : 修复popover删除组件按钮显示问题 2024-10-11 14:27:00 +08:00
odjbin
2c2055a11a Merge pull request 'master' (#820) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/820
 2024-10-11 06:06:42 +00:00
odjbin
502b4cff10 Merge pull request 'fix : 修复文章操作权限' (#819) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/819
 2024-10-11 06:06:31 +00:00
odjbin
c34fb88311 fix : 修复文章操作权限 2024-10-11 14:02:36 +08:00
odjbin
5949cdd843 Merge pull request 'master' (#818) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/818
 2024-10-11 04:15:10 +00:00
odjbin
22548f34c1 Merge pull request 'fix : 修复研发投入资金年份筛选时chart没渲染的bug' (#817) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/817
 2024-10-11 04:14:36 +00:00
odjbin
c643aa0e1d fix : 修复研发投入资金年份筛选时chart没渲染的bug 2024-10-11 12:13:59 +08:00
odjbin
9be3a714d1 Merge pull request 'master' (#816) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/816
 2024-10-11 03:39:32 +00:00
odjbin
478f9d2639 Merge pull request 'feat : 添加首页待办数据和研发投入资金年份筛选' (#815) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/815
 2024-10-11 03:39:17 +00:00
odjbin
19c4f7469d feat : 添加首页待办数据和研发投入资金年份筛选 2024-10-11 11:38:45 +08:00
odjbin
9b50bcd0ee Merge pull request 'master' (#814) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/814
 2024-10-09 13:20:01 +00:00
odjbin
06f3fcefee Merge pull request 'dj' (#813) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/813
 2024-10-09 13:17:26 +00:00
odjbin
62d18089c4 fix : 简化代码 2024-10-09 21:16:55 +08:00
odjbin
03a34bb637 Merge pull request 'fix : 优化首页样式' (#812) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/812
 2024-10-09 11:57:50 +00:00
odjbin
9d144af68a fix : 优化首页样式 2024-10-09 19:54:27 +08:00
odjbin
00c346c7b1 Merge remote-tracking branch 'origin/master' 2024-10-09 19:47:44 +08:00
odjbin
fcc67e542e fix : 优化首页样式 2024-10-09 19:47:21 +08:00
zhangkaihuai
f18dd60383 Merge pull request 'master' (#811) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/811
 2024-09-23 02:59:58 +00:00
zhangkaihuai
5019a88fd5 Merge pull request '更新 nginx.conf' (#810) from de into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/810
 2024-09-23 02:59:43 +00:00
zhangkaihuai
b573fafb8e 更新 nginx.conf 2024-09-23 02:59:22 +00:00
odjbin
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
odjbin
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
odjbin
158fbfd124 fix : 修复代理人回显 2024-09-22 21:41:46 +08:00
odjbin
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
odjbin
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
odjbin
35ba4523e8 fix : 修复个人中心代理人回显 2024-09-22 21:39:48 +08:00
odjbin
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
odjbin
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
odjbin
9e9c4beb45 fix : 研发资金格式化 2024-09-22 19:53:20 +08:00
odjbin
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
odjbin
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
odjbin
b8392f199c fix : 饼图间距 2024-09-22 18:46:10 +08:00
odjbin
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
odjbin
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
odjbin
b539f4a6d7 fix : 移除首页待办模拟数据 2024-09-22 18:07:15 +08:00
odjbin
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
odjbin
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
odjbin
47633749fb feat : 审批记录的代理审批,用户管理的设置代理功能,首页待办 2024-09-22 17:58:13 +08:00
odjbin
4e325196c8 feat : 个人中心和用户管理设置代理 2024-09-22 15:26:45 +08:00
odjbin
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
odjbin
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
odjbin
2546db9b64 fix : 修复首页适配/人员选择器取消功能bug 2024-09-22 12:21:57 +08:00
odjbin
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
odjbin
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
odjbin
d7d825b5b0 fix : 修复首页适配 2024-09-22 00:40:40 +08:00