Commit Graph

1244 Commits

Author SHA1 Message Date
1db5d4b11f Merge pull request 'master' (#601) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/601
2024-07-18 17:06:06 +00:00
04a65c6932 Merge pull request 'dd' (#600) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/600
2024-07-18 16:43:39 +00:00
e9333f7859 feat : 台账导入 2024-07-19 00:43:11 +08:00
0a2004e3ce feat : 台账导入 2024-07-19 00:41:15 +08:00
1ca25d8ec4 Merge pull request 'master' (#599) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/599
2024-07-18 14:56:29 +00:00
b69a147c61 Merge pull request 'feat : 台账导入' (#598) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/598
2024-07-18 14:56:21 +00:00
5deae5d846 feat : 台账导入 2024-07-18 22:56:08 +08:00
a9c7977347 Merge pull request 'master' (#597) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/597
2024-07-18 14:07:11 +00:00
c2c60d01af Merge pull request 'fix : 修复页面bug' (#596) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/596
2024-07-18 14:06:59 +00:00
9d5c393ebe fix : 修复页面bug 2024-07-18 22:06:23 +08:00
3c471b1124 Merge pull request 'master' (#595) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/595
2024-07-18 09:49:25 +00:00
3ec7a9c78e Merge pull request 'dd' (#594) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/594
2024-07-18 09:49:11 +00:00
5dc25d1480 fix : 项目实施台账刷新 2024-07-18 17:48:56 +08:00
ad3e7479f4 fix : 项目实施台账时间搜索 2024-07-18 17:33:54 +08:00
2b94151780 Merge pull request 'master' (#593) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/593
2024-07-18 08:57:15 +00:00
c082ffc884 Merge pull request 'fix : 项目实施台账时间搜索' (#592) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/592
2024-07-18 08:56:59 +00:00
618cc8cb87 fix : 项目实施台账时间搜索 2024-07-18 16:56:38 +08:00
9088a792d1 Merge pull request 'fix : 附件上传修复' (#591) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/591
2024-07-18 08:15:27 +00:00
8e91feb616 fix : 附件上传修复 2024-07-18 16:15:11 +08:00
ff09ed8c8a Merge pull request 'fix : 附件上传修复' (#590) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/590
2024-07-18 07:22:17 +00:00
203b53936f fix : 附件上传修复 2024-07-18 15:21:41 +08:00
fdb76c31a8 Merge pull request 'master' (#589) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/589
2024-07-18 06:53:26 +00:00
f154e2789b Merge remote-tracking branch 'origin/master' 2024-07-18 14:52:23 +08:00
b4cfb8a5c6 fix : 附件上传修复 2024-07-18 14:52:06 +08:00
484efa5854 Merge pull request 'master' (#588) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/588
2024-07-18 04:27:58 +00:00
6c874cac48 Merge pull request 'fix : 修复项目立项校验' (#587) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/587
2024-07-18 04:27:39 +00:00
63eba1d0dc Merge remote-tracking branch 'origin/master' 2024-07-18 12:22:45 +08:00
094474b680 fix : 修复项目立项校验 2024-07-18 12:19:43 +08:00
0cfe4a8698 Merge pull request 'fix : 修复项目立项校验' (#586) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/586
2024-07-18 03:45:59 +00:00
60d9b958bc fix : 修复项目立项校验 2024-07-18 11:45:30 +08:00
07b3457409 Merge pull request 'master' (#585) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/585
2024-07-17 15:11:51 +00:00
1591e5d057 Merge pull request 'feat : 刷新缓存' (#584) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/584
2024-07-17 15:11:41 +00:00
0c3580768b feat : 刷新缓存 2024-07-17 23:11:26 +08:00
1150fdac86 Merge pull request 'master' (#583) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/583
2024-07-17 14:48:03 +00:00
2793a62628 Merge pull request 'feat : 刷新缓存' (#582) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/582
2024-07-17 14:47:52 +00:00
cccd370671 feat : 刷新缓存 2024-07-17 22:47:38 +08:00
930684ac01 Merge pull request 'master' (#581) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/581
2024-07-17 14:11:32 +00:00
ec86d11537 Merge pull request 'fix : 修复年度计划创建及状态' (#580) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/580
2024-07-17 13:21:00 +00:00
2dea264c51 fix : 修复年度计划创建及状态 2024-07-17 21:20:48 +08:00
760d452311 Merge pull request 'master' (#579) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/579
2024-07-17 09:29:50 +00:00
7dbaf5ca48 Merge pull request 'fix : 还原需求征集详情按钮显示' (#578) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/578
2024-07-17 09:29:38 +00:00
fb469d5139 fix : 还原需求征集详情按钮显示 2024-07-17 17:29:24 +08:00
6f0800162b Merge pull request 'master' (#577) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/577
2024-07-17 09:21:41 +00:00
fbccc01bbc Merge pull request 'feat : 需求征集详情审核通过后加上需求上报按钮' (#576) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/576
2024-07-17 09:21:31 +00:00
92de396d12 feat : 需求征集详情审核通过后加上需求上报按钮 2024-07-17 17:20:45 +08:00
8f3432f9a0 Merge pull request 'master' (#575) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/575
2024-07-16 13:57:08 +00:00
a1dbcf8dce Merge remote-tracking branch 'origin/master' 2024-07-16 21:56:48 +08:00
ad4f2f5ba9 fix : 人员组件和组织结构组件改为懒加载模式 2024-07-16 21:56:39 +08:00
ae1c614ee8 Merge pull request 'master' (#574) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/574
2024-07-16 13:11:29 +00:00
da10fca727 Merge pull request 'fix : 修复人员选择框' (#573) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/573
2024-07-16 13:11:20 +00:00