Commit Graph

1452 Commits

Author SHA1 Message Date
1183be2987 Merge pull request 'master' (#713) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/713
2024-08-13 09:21:45 +00:00
11598c507b Merge pull request 'dd' (#712) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/712
2024-08-13 09:21:36 +00:00
38b6299dbf fix : 修改表格高度,页面左右边距,上传文件不能和标题并排 2024-08-13 17:21:19 +08:00
fa054d2a07 fix : 修复需求征集详情排版 2024-08-13 15:42:24 +08:00
7541b37117 Merge pull request 'master' (#711) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/711
2024-08-13 07:31:51 +00:00
cafba1e18c Merge pull request 'fix : 修复专项资金详情排版' (#710) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/710
2024-08-13 07:31:42 +00:00
4755849a8c fix : 修复专项资金详情排版 2024-08-13 15:31:32 +08:00
f219635348 Merge pull request 'master' (#709) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/709
2024-08-13 05:20:02 +00:00
ad6509f043 Merge pull request 'fix : 修复新增分摊排版' (#708) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/708
2024-08-13 05:19:44 +00:00
6cf0a0b0da fix : 修复新增分摊排版 2024-08-13 13:19:08 +08:00
b2774892de Merge pull request 'master' (#707) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/707
2024-08-12 16:42:19 +00:00
f7b0461218 Merge pull request 'fix : 修复新增分摊判断' (#706) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/706
2024-08-12 16:41:45 +00:00
42fc5524f3 fix : 修复新增分摊判断 2024-08-13 00:41:04 +08:00
ea51e6a300 Merge pull request 'master' (#705) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/705
2024-08-12 15:26:25 +00:00
10cfe6e6ad Merge pull request 'dd' (#704) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/704
2024-08-12 15:26:10 +00:00
1dd381cc1e fix : 修复角色替换 2024-08-12 23:25:56 +08:00
1e02e00000 fix : 修复项目实施-附件标签选项刷新 2024-08-12 22:50:56 +08:00
c799c16663 Merge pull request 'master' (#703) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/703
2024-08-12 14:38:03 +00:00
27cb965f3a Merge pull request 'fix : 修复新增专项资金/需求征集排版' (#702) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/702
2024-08-12 14:37:54 +00:00
e643d9ef86 fix : 修复新增专项资金/需求征集排版 2024-08-12 22:37:31 +08:00
becce5dfab Merge pull request 'master' (#701) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/701
2024-08-12 13:55:04 +00:00
1da833f451 Merge pull request 'fix : 修复需求上报排版' (#700) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/700
2024-08-12 13:54:53 +00:00
95a2161ab3 fix : 修复需求上报排版 2024-08-12 21:54:39 +08:00
873458595d Merge pull request 'master' (#699) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/699
2024-08-12 07:52:01 +00:00
a134dfd308 Merge pull request 'fix : 修复需求上报是否专项资金 清除后报错' (#698) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/698
2024-08-12 07:51:49 +00:00
8fade135fe fix : 修复需求上报是否专项资金 清除后报错 2024-08-12 15:51:34 +08:00
8408697b57 Merge pull request 'master' (#697) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/697
2024-08-12 07:30:49 +00:00
1bdb1e6739 Merge pull request 'fix : 修复需求上报是否专项资金 清除后报错' (#696) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/696
2024-08-12 07:30:40 +00:00
b497e2117d fix : 修复需求上报是否专项资金 清除后报错 2024-08-12 15:30:26 +08:00
04d62635f8 Merge pull request 'master' (#695) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/695
2024-08-11 16:05:10 +00:00
ef38b0c18f Merge pull request 'fix : 修复列表页面搜索框排版' (#694) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/694
2024-08-11 16:04:51 +00:00
83af021d33 fix : 修复列表页面搜索框排版 2024-08-12 00:04:31 +08:00
12d3fbcda1 Merge pull request 'master' (#693) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/693
2024-08-11 14:39:28 +00:00
2227ceabde Merge pull request 'fix : 费用分摊同项目同人不能多次分摊判断' (#692) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/692
2024-08-11 14:39:20 +00:00
3e3d738362 fix : 费用分摊同项目同人不能多次分摊判断 2024-08-11 22:38:15 +08:00
bcb74bf29f Merge pull request 'master' (#691) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/691
2024-08-11 14:31:38 +00:00
c4ad13b09c Merge pull request 'fix : 下拉框箭头显示' (#690) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/690
2024-08-11 14:31:28 +00:00
48430951ef fix : 下拉框箭头显示 2024-08-11 22:31:14 +08:00
443f598173 Merge pull request 'master' (#689) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/689
2024-08-11 10:38:21 +00:00
420605436c Merge pull request 'fix : 角色替换' (#688) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/688
2024-08-11 10:38:11 +00:00
a1fa0dab6a fix : 角色替换 2024-08-11 18:37:55 +08:00
8b5a4aba6f Merge pull request 'master' (#687) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/687
2024-08-10 14:52:21 +00:00
09b1c86ceb Merge pull request 'fix : 征集说明/专项资金介绍换行格式, 需求征集列表页搜索框间距, 切换账号层级, 需求上报4种情况排版' (#686) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/686
2024-08-10 14:49:09 +00:00
3dbaf21281 fix : 征集说明/专项资金介绍换行格式, 需求征集列表页搜索框间距, 切换账号层级, 需求上报4种情况排版 2024-08-10 22:48:46 +08:00
474cf72333 Merge pull request 'master' (#685) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/685
2024-08-07 15:48:24 +00:00
433f0bc712 Merge pull request 'fix : 修改页面排版' (#684) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/684
2024-08-07 15:48:14 +00:00
e4d0b87069 fix : 修改页面排版 2024-08-07 23:47:49 +08:00
8d87e2a7a0 Merge pull request 'master' (#683) from master into prod
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/683
2024-08-07 15:05:09 +00:00
4b56a92444 Merge pull request 'fix : 选择框为远程搜索解决卡顿问题' (#682) from dd into master
Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/682
2024-08-07 15:04:57 +00:00
3289e799be fix : 选择框为远程搜索解决卡顿问题 2024-08-07 23:04:46 +08:00