Commits · 18f6cbb311ddfa5e6d40b50bb723695b74d84496 · shenshaokai / jinfa-platform

29 Mar, 2022 4 commits
- merge: 合并0218版本代码 · 18f6cbb3
  前端-许佳敏 authored Mar 29, 2022
  
  18f6cbb3
- Merge branch 'v2-220218-xxx' into 'v2-220218' · 00c824d8
  前端-彭佳文 authored Mar 29, 2022
```
对接素材管理

See merge request linkseeks-design/pro-platform!58
```
  00c824d8
- 素材管理对接完成 · 50f73ca9
  xiexiuxing authored Mar 29, 2022
  
  50f73ca9
- 素材管理对接完成 · baadbec3
  xiexiuxing authored Mar 29, 2022
  
  baadbec3
28 Mar, 2022 5 commits
- merge: 解决0418合并后冲突 · fe76d0fa
  前端-许佳敏 authored Mar 28, 2022
  
  fe76d0fa
- merge: 合并0318版本代码 · 87b07862
  前端-许佳敏 authored Mar 28, 2022
  
  87b07862
- Merge branch 'feat-memberLevel' into 'v2-220418' · 2480b1b0
  Bill authored Mar 28, 2022
```
feat: 会员等级

See merge request linkseeks-design/pro-platform!49
```
  2480b1b0
- chore: 跟进后台字段更改 · 0870e4d5
  XieZhiXiong authored Mar 28, 2022
  
  0870e4d5
- Merge branch 'v2-220418' of… · e8c3c894
  XieZhiXiong authored Mar 28, 2022
```
Merge branch 'v2-220418' of ssh://gitlab.shushangyun.com:8122/linkseeks-design/pro-platform into feat-memberLevel
```
  e8c3c894
26 Mar, 2022 2 commits
- Merge branch 'feat-purchaseBid' into 'v2-220418' · 4faee602
  前端-彭佳文 authored Mar 26, 2022
```
feat: 重构采购竞价

See merge request linkseeks-design/pro-platform!46
```
  4faee602
- Merge branch 'v2-220418-order' into 'v2-220418' · 57f9bc11
  前端-彭佳文 authored Mar 26, 2022
```
V2 220418 order

See merge request linkseeks-design/pro-platform!47
```
  57f9bc11
25 Mar, 2022 20 commits
- feat: 重构采购竞价 · 70feed17
  卢均锐 authored Mar 25, 2022
```
-暂存相关修改
```
  70feed17
- Merge branch 'v2-0318-xxx' into 'v2-220318' · a809bc31
  前端-彭佳文 authored Mar 25, 2022
```
同步合同代码到0318

See merge request linkseeks-design/pro-platform!45
```
  a809bc31
- 同步合同代码到0318 · 86462157
  xiexiuxing authored Mar 25, 2022
  
  86462157
- Merge branch 'v2-220418' of https://gitlab.shushangyun.com/GavinPeng/pro-platform into v2-220418 · 88239607
  Gavin Peng authored Mar 25, 2022
  
  88239607
- feat: 完善送货计划详情 · 52195e37
  Gavin Peng authored Mar 25, 2022
  
  52195e37
- Merge branch 'v2-220418' of… · bec768a7
  rainbowmorel@163.com authored Mar 25, 2022
```
Merge branch 'v2-220418' of https://gitlab.shushangyun.com/GavinPeng/pro-platform into v2-0418-transferOrder-molei
```
  bec768a7
- add from · 52c07ae3
  rainbowmorel@163.com authored Mar 25, 2022
  
  52c07ae3
- Merge branch 'fix0318' into 'v2-220318' · 3818cacc
  Bill authored Mar 25, 2022
```
创建新增招标提交时,需判断当前采购会员是否创建采购门户

See merge request linkseeks-design/pro-platform!44
```
  3818cacc
- feat: 添加会员等级管理模块相关 · a3c6b0f2
  XieZhiXiong authored Mar 25, 2022
  
  a3c6b0f2
- address Drawer · cff81bd9
  rainbowmorel@163.com authored Mar 25, 2022
  
  cff81bd9
- fix: 创建新增招标提交时,需判断当前采购会员是否创建采购门户 · 1123efff
  前端-钟卫鹏 authored Mar 25, 2022
  
  1123efff
- Merge branch 'v2-0318-xxx' into 'v2-220318' · 35ac104b
  前端-彭佳文 authored Mar 25, 2022
```
V2 0318 xxx

See merge request linkseeks-design/pro-platform!43
```
  35ac104b
- 同步合同代码到0318 · 5c04f1ad
  xiexiuxing authored Mar 25, 2022
  
  5c04f1ad
- Merge branch 'fix-v2' into 'v2' · df35ab4a
  前端-许冠华 authored Mar 25, 2022
```
fix: 修改新增询价报价BUG 报价单价提交为空的问题

See merge request linkseeks-design/pro-platform!40

(cherry picked from commit 6e6afb94)

1e43943f fix: 修改新增询价报价BUG 报价单价提交为空的问题
```
  df35ab4a
- Merge branch 'cherry-pick-d5daf6bd-2' into 'v2-220318' · 7f99aabb
  前端-许冠华 authored Mar 25, 2022
```
Merge branch 'fix-v2' into 'v2'

See merge request linkseeks-design/pro-platform!39
```
  7f99aabb
- Merge branch 'fix-v2' into 'v2' · 861596e3
  前端-许冠华 authored Mar 25, 2022
```
Fix v2

See merge request linkseeks-design/pro-platform!38

(cherry picked from commit d5daf6bd)

6cb576bc fix: 修复新增询价报价 - 商品报价金额计算的问题
5e6517c5 fix: 增加物流门户TAB切换必填项角标提示
```
  861596e3
- 合并代码 · e1a97150
  Gavin Peng authored Mar 25, 2022
  
  e1a97150
- 合并前 · 96dd73b3
  Gavin Peng authored Mar 25, 2022
  
  96dd73b3
- Merge branch 'v2-220418' of… · fd1279d6
  rainbowmorel@163.com authored Mar 25, 2022
```
Merge branch 'v2-220418' of https://gitlab.shushangyun.com/GavinPeng/pro-platform into v2-0418-transferOrder-molei
```
  fd1279d6
- 日期提交 · 0d6fbf10
  rainbowmorel@163.com authored Mar 25, 2022
  
  0d6fbf10
24 Mar, 2022 9 commits
- Merge branch 'v2-220418' into 'v2-220418' · 737bc0e5
  前端-彭佳文 authored Mar 24, 2022
```
V2 220418

See merge request linkseeks-design/pro-platform!37
```
  737bc0e5
- Merge branch 'v2-0318-xxx' into 'v2-220318' · 2aec1de2
  前端-彭佳文 authored Mar 24, 2022
```
V2 0318 xxx

See merge request linkseeks-design/pro-platform!35
```
  2aec1de2
- flx:合同代码合并0318 · bf560019
  xiexiuxing authored Mar 24, 2022
  
  bf560019
- Merge branch 'v2-220418' into 'v2-220418' · dce06502
  前端-彭佳文 authored Mar 24, 2022
```
V2 220418

See merge request GavinPeng/pro-platform!12
```
  dce06502
- flx:合同代码合并0318 · 0a666aa0
  xiexiuxing authored Mar 24, 2022
  
  0a666aa0
- 同步代码 · f48ccee7
  xiexiuxing authored Mar 24, 2022
  
  f48ccee7
- Merge branch 'v2-220418' of… · 74f603e2
  wzy authored Mar 24, 2022
```
Merge branch 'v2-220418' of ssh://gitlab.shushangyun.com:8122/linkseeks-design/pro-platform into v2-220418
```
  74f603e2
- feat: 进销存-单据管理修改 · d30ba54c
  wzy authored Mar 24, 2022
  
  d30ba54c
- 同步代码 · ad204973
  xiexiuxing authored Mar 24, 2022
  
  ad204973