Commits · 5b7d7ededb389d7185c0fe31ec1ef48e4db27c29 · shenshaokai / jinfa-platform

28 Mar, 2022 6 commits
- Merge branch 'v2-220418' of… · 5b7d7ede
  wzy authored Mar 28, 2022
```
Merge branch 'v2-220418' of ssh://gitlab.shushangyun.com:8122/linkseeks-design/pro-platform into v2-220418
```
  5b7d7ede
- feat: 价格库页面接口对接 · 6c9f0218
  wzy authored Mar 28, 2022
  
  6c9f0218
- 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
- Merge branch 'v2-220418' of… · c7ef0a4d
  wzy authored Mar 28, 2022
```
Merge branch 'v2-220418' of ssh://gitlab.shushangyun.com:8122/linkseeks-design/pro-platform into v2-220418
```
  c7ef0a4d
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 13 commits
- feat: 重构采购竞价 · 70feed17
  卢均锐 authored Mar 25, 2022
```
-暂存相关修改
```
  70feed17
- Merge branch 'v2-220418' of… · a33576a1
  wzy authored Mar 25, 2022
```
Merge branch 'v2-220418' of ssh://gitlab.shushangyun.com:8122/linkseeks-design/pro-platform into v2-220418
```
  a33576a1
- feat: 进销存-单据管理接口对接 · ddb59406
  wzy authored Mar 25, 2022
  
  ddb59406
- 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
- feat: 添加会员等级管理模块相关 · a3c6b0f2
  XieZhiXiong authored Mar 25, 2022
  
  a3c6b0f2
- address Drawer · cff81bd9
  rainbowmorel@163.com authored Mar 25, 2022
  
  cff81bd9
- 合并代码 · 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 18 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-220418' into 'v2-220418' · dce06502
  前端-彭佳文 authored Mar 24, 2022
```
V2 220418

See merge request GavinPeng/pro-platform!12
```
  dce06502
- 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
- Merge branch 'v2-0418-transferOrder-molei' into 'v2-220418' · 5bbdbc0d
  前端-彭佳文 authored Mar 24, 2022
```
V2 0418 transfer order molei

See merge request GavinPeng/pro-platform!11
```
  5bbdbc0d
- Merge branch 'v2-220418' of https://gitlab.shushangyun.com/GavinPeng/pro-platform into jw-v2-220418 · 7ad7a4ff
  rainbowmorel@163.com authored Mar 24, 2022
```
# Conflicts:
#	src/pages/order/constants/table-column.ts
```
  7ad7a4ff
- Merge branch 'v2-220418' of… · 876d9464
  rainbowmorel@163.com authored Mar 24, 2022
```
Merge branch 'v2-220418' of https://gitlab.shushangyun.com/linkseeks-design/pro-platform into jw-v2-220418
```
  876d9464
- fix: 合并 · 7ad09d44
  Gavin Peng authored Mar 24, 2022
  
  7ad09d44
- 新增收货单功能 · 308d4bbc
  rainbowmorel@163.com authored Mar 24, 2022
  
  308d4bbc
- Merge branch 'v2-220418' into 'v2-220418' · 542c8bc3
  前端-彭佳文 authored Mar 24, 2022
```
fix: 注释获取下游销售按钮

See merge request linkseeks-design/pro-platform!12
```
  542c8bc3
- Merge branch 'fixv2' into 'v2' · c4776cef
  许佳敏 authored Mar 24, 2022
```
fix: 招标,抽取专家,按条件抽取专家时保存,报服务内部错误

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

(cherry picked from commit 29d6e2fb)

ce02c6bd fix: 招标,抽取专家,按条件抽取专家时保存,报服务内部错误
```
  c4776cef
- Merge branch 'v2-220418' into 'v2-220418' · 72353d79
  前端-彭佳文 authored Mar 24, 2022
```
V2 220418

See merge request GavinPeng/pro-platform!9
```
  72353d79
- chore: 注释影响的shell的代码 · 3835979d
  前端-许佳敏 authored Mar 24, 2022
  
  3835979d
- Merge branch 'fix-pasword-bug' into 'v2' · 13ab6341
  许佳敏 authored Mar 24, 2022
```
fix: 修改密码验证组件以及错误提示

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

(cherry picked from commit cd90bd38)

05eaa3df fix: 修改密码验证组件以及错误提示
```
  13ab6341
- Merge branch 'xi-v2-220418' into v2-0418-transferOrder-molei · 4a098946
  rainbowmorel@163.com authored Mar 24, 2022
  
  4a098946
- add mock data · f77797c7
  rainbowmorel@163.com authored Mar 24, 2022
  
  f77797c7
- fix: 合并前提交 · a7bfd3ac
  Gavin Peng authored Mar 24, 2022
  
  a7bfd3ac
- Merge branch 'v2-220418' of… · b3b2e2f6
  Gavin Peng authored Mar 24, 2022
```
Merge branch 'v2-220418' of https://gitlab.shushangyun.com/linkseeks-design/pro-platform into v2-220418
```
  b3b2e2f6
23 Mar, 2022 1 commit

Merge branch 'v2-220418' of… · deea026b

authored Mar 23, 2022

Merge branch 'v2-220418' of ssh://gitlab.shushangyun.com:8122/linkseeks-design/pro-platform into v2-220418

deea026b