Commit Graph

1365 Commits

Author SHA1 Message Date
f36d7abca8 Merge pull request 'fix : 修复文章下载文件名问题' (#889) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/889
2024-10-26 16:56:02 +00:00
4f2bfb80ae fix : 修复文章下载文件名问题 2024-10-27 00:55:49 +08:00
7ee2f084db Merge pull request 'fix : 修改文章详情里面附件链接颜色' (#887) from dj into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/887
2024-10-26 13:29:23 +00:00
b5d2dceda1 fix : 修改文章详情里面附件链接颜色 2024-10-26 21:28:48 +08: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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
a82030b04f fix : 修复年docx文件预览框溢出bug 2024-10-23 22:53:46 +08:00
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
2a788fff0a fix : 修复年度计划项目详情跳转 2024-10-23 22:32:10 +08:00
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
20b2203930 fix : 修复文章详情排版 2024-10-23 21:56:18 +08:00
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
44a50176cc feat : 费用管理中新增项目台账 2024-10-23 21:37:17 +08:00
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
57ec7832f2 fix : 修复文件预览弹窗适配 2024-10-22 23:19:44 +08:00
dfdaabeb48 fix : 修复新增研发投入资金bug 2024-10-20 21:17:45 +08:00
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