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

1278 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
odjbin
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
odjbin
ea38a6ddef fix : 修复首页适配 2024-09-22 00:31:00 +08:00
odjbin
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
odjbin
c37e150bb9 fix : 修复首页适配 2024-09-22 00:28:18 +08:00
odjbin
fe45524d52 fix : 修复首页适配 2024-09-22 00:27:22 +08:00
odjbin
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
odjbin
349f514bcb fix : 修复首页数据展示 2024-09-21 23:51:33 +08:00
odjbin
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
odjbin
7b155f649d fix : 修复首页数据展示,更改文章时间字段 2024-09-21 22:37:59 +08:00
odjbin
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
odjbin
4f594b0bfd feat : 文章管理crud功能完成 2024-09-21 21:59:12 +08:00
odjbin
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
odjbin
090e9a1ea8 feat : 研发投入资金crud功能完成 2024-09-21 18:19:17 +08:00
odjbin
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
odjbin
10bb9cbc37 feat : 研发投入资金和文章管理 2024-09-21 15:39:45 +08:00
odjbin
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
odjbin
bbf63ec51f fix : 优化首页样式 2024-09-19 17:12:50 +08:00
odjbin
ffaf17d6f9 Merge pull request 'fix : 优化首页样式' (#776) from de into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/776
 2024-09-18 16:52:06 +00:00
odjbin
e9835df985 fix : 优化首页样式 2024-09-19 00:51:55 +08:00
odjbin
377e041eb2 Merge pull request 'de' (#775) from de into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/775
 2024-09-18 16:26:18 +00:00
odjbin
b3fe207469 fix : 优化首页样式 2024-09-19 00:26:05 +08:00
odjbin
e527deabd5 fix : 首页备份 2024-09-18 22:30:39 +08:00
odjbin
6800117ed4 Merge pull request 'de' (#773) from de into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/773
 2024-09-18 14:26:07 +00:00