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

1681 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
odjbin
d316661574 Merge pull request 'master' (#855) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/855
 2024-10-23 14:32:41 +00:00
odjbin
3690235ae7 Merge pull request 'fix : 修复年度计划项目详情跳转' (#854) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/854
 2024-10-23 14:32:32 +00:00
odjbin
2a788fff0a fix : 修复年度计划项目详情跳转 2024-10-23 22:32:10 +08:00
odjbin
a3b93d0e1a Merge pull request 'master' (#853) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/853
 2024-10-23 13:58:17 +00:00
odjbin
3d6bdd50ca Merge pull request 'fix : 修复文章详情排版' (#852) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/852
 2024-10-23 13:58:08 +00:00
odjbin
20b2203930 fix : 修复文章详情排版 2024-10-23 21:56:18 +08:00
odjbin
d23a86e9ea Merge pull request 'master' (#851) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/851
 2024-10-23 13:38:31 +00:00
odjbin
6afc855cd8 Merge pull request 'feat : 费用管理中新增项目台账' (#850) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/850
 2024-10-23 13:38:06 +00:00
odjbin
44a50176cc feat : 费用管理中新增项目台账 2024-10-23 21:37:17 +08:00
odjbin
069816e17f Merge pull request 'dj' (#849) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/849
 2024-10-22 15:20:03 +00:00
odjbin
57ec7832f2 fix : 修复文件预览弹窗适配 2024-10-22 23:19:44 +08:00
odjbin
dfdaabeb48 fix : 修复新增研发投入资金bug 2024-10-20 21:17:45 +08:00
odjbin
f427fa9ef2 Merge pull request 'master' (#848) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/848
 2024-10-17 14:49:45 +00:00
odjbin
bfc6845071 Merge pull request 'fix : 清空登录默认账号' (#847) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/847
 2024-10-17 14:48:53 +00:00
odjbin
ea9047ee2a fix : 清空登录默认账号 2024-10-17 22:47:27 +08:00
odjbin
87ab014111 Merge pull request 'master' (#846) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/846
 2024-10-17 14:36:15 +00:00
odjbin
1341f3749b Merge pull request 'fix : 修复首页时间提示' (#845) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/845
 2024-10-17 14:36:05 +00:00
odjbin
30f3f3bdcd fix : 修复首页时间提示 2024-10-17 22:35:54 +08:00
odjbin
f9d7b765d1 Merge pull request 'master' (#844) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/844
 2024-10-17 14:25:57 +00:00
odjbin
fbb277cb30 Merge pull request 'fix : 修复非超级管理员的名称搜索问题' (#843) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/843
 2024-10-17 14:25:45 +00:00
odjbin
145bb01fdd fix : 修复非超级管理员的名称搜索问题 2024-10-17 22:25:31 +08:00
odjbin
7601a7872c Merge pull request 'master' (#842) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/842
 2024-10-14 06:49:01 +00:00
odjbin
f36c8ffcac Merge pull request 'fix : 清空登录默认账号' (#841) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/841
 2024-10-14 06:36:01 +00:00
odjbin
de0b64909d fix : 清空登录默认账号 2024-10-14 14:35:43 +08:00
odjbin
39af97815c Merge pull request 'master' (#840) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/840
 2024-10-14 04:17:33 +00:00
odjbin
bcffdba692 Merge pull request 'fix : 修改首页提示' (#839) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/839
 2024-10-14 04:17:25 +00:00
odjbin
2e9d015623 fix : 修改首页提示 2024-10-14 12:16:57 +08:00
odjbin
4654f71f11 Merge pull request 'master' (#838) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/838
 2024-10-13 16:28:06 +00:00
odjbin
9d63e05d03 Merge pull request 'fix : 修改首页提示' (#837) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/837
 2024-10-13 16:27:46 +00:00
odjbin
6ea9538b0a fix : 修改首页提示 2024-10-14 00:27:15 +08:00
odjbin
88f4a93a81 Merge pull request 'master' (#836) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/836
 2024-10-13 14:48:38 +00:00
odjbin
9671d5a36d Merge pull request 'dj' (#835) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/835
 2024-10-13 14:48:29 +00:00
odjbin
f476dc9203 feat : 首页待办/已办查看更多列表 2024-10-13 22:47:44 +08:00
odjbin
235ec0c4ff fix : 修复首页刷新功能 2024-10-13 22:18:18 +08:00
odjbin
f2ba567b93 fix : 修复首页刷新功能 2024-10-13 22:15:39 +08:00
odjbin
525385cd17 Merge pull request 'fix : 修复首页研发投入资金渲染bug' (#834) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/834
 2024-10-13 14:08:27 +00:00
odjbin
ee8df164d1 fix : 修复首页研发投入资金渲染bug 2024-10-13 22:08:10 +08:00
odjbin
df2d53b9da Merge pull request 'master' (#833) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/833
 2024-10-13 14:00:02 +00:00
odjbin
9b1d51273d Merge pull request 'fix : 修复审批节点' (#832) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/832
 2024-10-13 13:59:52 +00:00
odjbin
0fc92b7742 fix : 修复审批节点 2024-10-13 21:59:27 +08:00
odjbin
1996ff0b3a Merge pull request 'master' (#831) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/831
 2024-10-13 09:45:25 +00:00
odjbin
735dedfb42 Merge pull request 'feat : 首页项目四个状态统计' (#830) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/830
 2024-10-13 09:45:15 +00:00
odjbin
4ab7a04c92 feat : 首页项目四个状态统计 2024-10-13 17:44:53 +08:00
odjbin
8864e13030 Merge pull request 'master' (#829) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/829
 2024-10-11 08:17:47 +00:00
odjbin
b3bfff9588 Merge pull request 'dj' (#828) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/828
 2024-10-11 08:17:38 +00:00
odjbin
c6d8b45537 fix : 优化费用台账-导出按钮位置 2024-10-11 16:07:35 +08:00
odjbin
e7e1f33985 fix : 修复pointTag组件报错 2024-10-11 15:40:28 +08:00
odjbin
4f67329f6b Merge pull request 'master' (#827) from master into prod 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/827
 2024-10-11 07:26:52 +00:00
odjbin
4aff4667ef Merge pull request 'feat : 费用台账导出' (#826) from dj into master 
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/826
 2024-10-11 07:26:33 +00:00
odjbin
41fd5bef4d feat : 费用台账导出 2024-10-11 15:26:03 +08:00