Commit Graph

1732 Commits

Author SHA1 Message Date
7d234e523b Merge pull request 'master' (#886) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/886
2024-10-26 13:18:51 +00:00
7c7984b08f Merge pull request 'fix : 隐藏多图片上传' (#885) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/885
2024-10-26 13:18:37 +00:00
68f9c787e9 fix : 隐藏多图片上传 2024-10-26 21:18:22 +08:00
bf6779a008 Merge pull request 'master' (#884) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/884
2024-10-26 13:16:33 +00:00
baecbac6c3 Merge pull request 'fix : 修复tinymce编辑器的图片上传loading提示' (#883) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/883
2024-10-26 13:16:17 +00:00
ea625f98f3 fix : 修复tinymce编辑器的图片上传loading提示 2024-10-26 21:15:58 +08:00
065a232333 Merge pull request 'master' (#882) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/882
2024-10-26 13:03:36 +00:00
9b2baf43ef Merge pull request 'fix : 修复需求汇总的征集名称匹配及注释部分log' (#881) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/881
2024-10-26 13:03:20 +00:00
49596316f2 fix : 修复需求汇总的征集名称匹配及注释部分log 2024-10-26 21:02:53 +08:00
4c492a8866 Merge pull request 'master' (#880) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/880
2024-10-25 15:31:11 +00:00
203721e9e0 Merge pull request 'fix : 修复需求上报提交功能' (#879) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/879
2024-10-25 15:31:03 +00:00
1a72339ade fix : 修复需求上报提交功能 2024-10-25 23:30:54 +08:00
bb84f72836 Merge pull request 'master' (#878) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/878
2024-10-25 15:11:33 +00:00
83a740de91 Merge pull request 'fix : 修复首页待立项等任务跳转及各种类型文章跳转显示对应数据' (#877) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/877
2024-10-25 15:11:24 +00:00
fb0a0cd719 fix : 修复首页待立项等任务跳转及各种类型文章跳转显示对应数据 2024-10-25 23:11:01 +08:00
45b8b91152 Merge pull request 'master' (#876) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/876
2024-10-25 13:50:16 +00:00
2b36fd181f Merge pull request 'dj' (#875) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/875
2024-10-25 13:50:05 +00:00
5c2ec69fd6 feat : 项目实施-上传附件加上缓存 2024-10-25 21:49:53 +08:00
ffe7d0bb6c feat : 阶段变更的项目基本信息加上"是否在预算内"字段 2024-10-25 21:41:26 +08:00
94a46d01fe Merge pull request 'master' (#874) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/874
2024-10-25 13:33:13 +00:00
99d8bc156b Merge pull request 'dj' (#873) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/873
2024-10-25 13:33:04 +00:00
e78ae692ee feat : 新增需求上报缓存 2024-10-25 21:32:45 +08:00
80bf9ae9bd feat : 新增需求征集缓存 2024-10-25 21:26:58 +08:00
7be10381bd Merge pull request 'master' (#872) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/872
2024-10-25 12:52:42 +00:00
1fbd31f137 Merge pull request 'dj' (#871) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/871
2024-10-25 12:52:33 +00:00
9d55426a2a feat : 新增需求征集缓存 2024-10-25 20:52:20 +08:00
e0299baf46 fix : 修复项目归档全部附件名称搜索 2024-10-25 20:52:03 +08:00
39fedea1ca Merge pull request 'master' (#870) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/870
2024-10-25 12:21:03 +00:00
ed8104ba92 Merge pull request 'feat : 项目归档加上全部标签' (#869) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/869
2024-10-25 12:20:54 +00:00
c5d7961b4d feat : 项目归档加上全部标签 2024-10-25 20:20:39 +08:00
ec9c4c526c Merge pull request 'master' (#868) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/868
2024-10-25 02:48:22 +00:00
0cb840a466 Merge pull request 'dj' (#867) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/867
2024-10-25 02:48:06 +00:00
b8aa24e6a0 fix : 修复tinymce的多图片上传和附件上传 2024-10-25 10:46:53 +08:00
e3b17f0f04 fix : 修复tinymce的多图片上传和附件上传 2024-10-25 10:46:35 +08:00
a1b249b86c Merge pull request 'master' (#866) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/866
2024-10-24 15:04:46 +00:00
d12d4865c7 Merge pull request 'feat : 项目基本信息加上是否在预算内字段' (#865) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/865
2024-10-24 15:04:37 +00:00
a01cede9c0 feat : 项目基本信息加上是否在预算内字段 2024-10-24 23:01:54 +08:00
318410ff74 Merge pull request 'feat : 需求上报和详情新增是否在预算内字段' (#864) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/864
2024-10-24 14:04:59 +00:00
a8feed2d7f feat : 需求上报和详情新增是否在预算内字段 2024-10-24 22:04:46 +08:00
fe0a6bb3be Merge pull request 'master' (#863) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/863
2024-10-24 05:13:45 +00:00
872c54abd3 Merge pull request 'fix : 修复前置流程弹窗的提示,首页需求上报跳转位置' (#862) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/862
2024-10-24 05:13:34 +00:00
c2c1cfd6e1 fix : 修复前置流程弹窗的提示,首页需求上报跳转位置 2024-10-24 13:13:11 +08:00
41bd6d1686 Merge pull request 'master' (#861) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/861
2024-10-24 02:29:18 +00:00
779d6f7094 Merge pull request 'fix : 按钮放在右上角浮动' (#860) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/860
2024-10-24 02:29:06 +00:00
5c4f25dc1a fix : 按钮放在右上角浮动 2024-10-24 10:28:53 +08:00
e65bf98db2 Merge pull request 'master' (#859) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/859
2024-10-23 15:15:36 +00:00
c17396d44a Merge pull request 'fix : 按钮放在右上角浮动' (#858) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/858
2024-10-23 15:15:15 +00:00
344a3a03b3 fix : 按钮放在右上角浮动 2024-10-23 23:14:56 +08:00
dc8fc056f9 Merge pull request 'master' (#857) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/857
2024-10-23 14:56:37 +00:00
9ff596c167 Merge pull request 'fix : 修复年docx文件预览框溢出bug' (#856) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/856
2024-10-23 14:56:28 +00:00