Commits · v2-0518-jinfa-srm-cut-1-merge · shenshaokai / jinfa-platform

18 Oct, 2022 1 commit
- Merge remote-tracking branch 'upstream/jinfa-0618' into v2-0518-jinfa-srm-cut-1-merge · 9103b79a
  shenshaokai authored Oct 18, 2022
  
  9103b79a
14 Oct, 2022 3 commits
- Merge branch 'jinfa-0518' into 'jinfa-0518' · 34ce74d8
  前端-吴智勇 authored Oct 14, 2022
```
Jinfa 0518

See merge request project/jinfa-platform!330
```
  34ce74d8
- Merge branch 'jinfa-0518' of… · b8b855b7
  wzy authored Oct 14, 2022
```
Merge branch 'jinfa-0518' of ssh://gitlab.shushangyun.com:8122/project/jinfa-platform into jinfa-0518
```
  b8b855b7
- fix: 去除时分秒 · 636ef66d
  wzy authored Oct 14, 2022
  
  636ef66d
11 Oct, 2022 2 commits
- Merge branch 'jinfa-0518' into 'jinfa-0518' · 1460250a
  前端-吴智勇 authored Oct 11, 2022
```
fix: 请购单剩余 为0处理

See merge request project/jinfa-platform!329
```
  1460250a
- fix: 请购单剩余为0处理 · 7a8b33ac
  wzy authored Oct 11, 2022
  
  7a8b33ac
10 Oct, 2022 8 commits
- Merge branch 'jinfa-0518' into 'jinfa-0518' · fa1a1167
  前端-吴智勇 authored Oct 10, 2022
```
Jinfa 0518

See merge request project/jinfa-platform!328
```
  fa1a1167
- Merge branch 'jinfa-0518' of… · 41de7a22
  wzy authored Oct 10, 2022
```
Merge branch 'jinfa-0518' of ssh://gitlab.shushangyun.com:8122/project/jinfa-platform into jinfa-0518
```
  41de7a22
- fix：合同采购物料校验问题 · f4e6d1ef
  wzy authored Oct 10, 2022
  
  f4e6d1ef
- Merge branch 'jinfa-0518' into 'jinfa-0518' · aa43e8f5
  前端-吴智勇 authored Oct 10, 2022
```
fix: 采购物料为空问题处理

See merge request project/jinfa-platform!327
```
  aa43e8f5
- fix: 采购物料为空问题处理 · 199954d4
  wzy authored Oct 10, 2022
  
  199954d4
- Merge branch 'jinfa-0518' into 'jinfa-0518' · ec355f34
  前端-吴智勇 authored Oct 10, 2022
```
Jinfa 0518

See merge request project/jinfa-platform!326
```
  ec355f34
- Merge branch 'jinfa-0518' of… · b92031cd
  wzy authored Oct 10, 2022
```
Merge branch 'jinfa-0518' of ssh://gitlab.shushangyun.com:8122/project/jinfa-platform into jinfa-0518
```
  b92031cd
- fix: 合同-时间为空校验、去除打印 · 5bd02cae
  wzy authored Oct 10, 2022
  
  5bd02cae
29 Sep, 2022 2 commits
- Merge branch 'jinfa-0518' into 'jinfa-0518' · 6c2f1d20
  前端-吴智勇 authored Sep 29, 2022
```
fix: 生成合同校验时间

See merge request project/jinfa-platform!325
```
  6c2f1d20
- fix: 生成合同校验时间 · 6015f4cc
  wzy authored Sep 29, 2022
  
  6015f4cc
21 Sep, 2022 5 commits
- Merge branch 'jinfa-0518' into 'jinfa-0518' · e6ec82e5
  前端-吴智勇 authored Sep 21, 2022
```
Jinfa 0518

See merge request project/jinfa-platform!324
```
  e6ec82e5
- Merge branch 'jinfa-0518' of… · fbfbdd5d
  wzy authored Sep 21, 2022
```
Merge branch 'jinfa-0518' of ssh://gitlab.shushangyun.com:8122/project/jinfa-platform into jinfa-0518
```
  fbfbdd5d
- fix: 合同文件不超过10M · b9cbcdc4
  wzy authored Sep 21, 2022
  
  b9cbcdc4
- Merge branch 'jinfa-0518' into 'jinfa-0518' · 1105c26a
  前端-吴智勇 authored Sep 21, 2022
```
fix: 文件上传大小20->10

See merge request project/jinfa-platform!323
```
  1105c26a
- fix: 文件上传大小20->10 · 821282a3
  wzy authored Sep 21, 2022
  
  821282a3
20 Sep, 2022 6 commits
- Merge branch 'jinfa-0518' into 'jinfa-0518' · 274fb8b2
  前端-吴智勇 authored Sep 20, 2022
```
Jinfa 0518

See merge request project/jinfa-platform!322
```
  274fb8b2
- Merge branch 'jinfa-0518' of… · 8161a267
  wzy authored Sep 20, 2022
```
Merge branch 'jinfa-0518' of ssh://gitlab.shushangyun.com:8122/project/jinfa-platform into jinfa-0518
```
  8161a267
- fix: 文件上传错误提示 · 179ea6c2
  wzy authored Sep 20, 2022
  
  179ea6c2
- Merge branch 'jinfa-0518' into 'jinfa-0518' · 21c521e1
  前端-吴智勇 authored Sep 20, 2022
```
Jinfa 0518

See merge request project/jinfa-platform!321
```
  21c521e1
- Merge branch 'jinfa-0518' of… · 683f2768
  wzy authored Sep 20, 2022
```
Merge branch 'jinfa-0518' of ssh://gitlab.shushangyun.com:8122/project/jinfa-platform into jinfa-0518
```
  683f2768
- fix: 编辑清空业务员信息 · ab127831
  wzy authored Sep 20, 2022
  
  ab127831
08 Sep, 2022 3 commits
- Merge branch 'jinfa-0518' into 'jinfa-0518' · c16214f7
  前端-吴智勇 authored Sep 08, 2022
```
Jinfa 0518

See merge request project/jinfa-platform!320
```
  c16214f7
- Merge branch 'jinfa-0518' of… · 1958971a
  wzy authored Sep 08, 2022
```
Merge branch 'jinfa-0518' of ssh://gitlab.shushangyun.com:8122/project/jinfa-platform into jinfa-0518
```
  1958971a
- fix: 恢复组织机构新增按钮 · 3a4db555
  wzy authored Sep 08, 2022
  
  3a4db555
01 Sep, 2022 8 commits
- Merge branch 'fix-jinfa-0518' into 'jinfa-0518' · 7ed3a9e4
  前端-许冠华 authored Sep 01, 2022
```
fix: 修复会员审核分类数据回显问题

See merge request project/jinfa-platform!319
```
  7ed3a9e4
- Merge branch 'jinfa-0518' of… · bccd83b3
  吴春梅 authored Sep 01, 2022
```
Merge branch 'jinfa-0518' of https://gitlab.shushangyun.com/project/jinfa-platform into fix-jinfa-0518
```
  bccd83b3
- fix: 修复会员审核分类数据回显问题 · 326ee1b7
  吴春梅 authored Sep 01, 2022
  
  326ee1b7
- Merge branch 'jinfa-0518' into 'jinfa-0518' · 6121632a
  前端-吴智勇 authored Sep 01, 2022
```
fix: 合同修改-生成合同时间去除时分秒

See merge request project/jinfa-platform!318
```
  6121632a
- fix: 合同修改-生成合同时间去除时分秒 · bc06920d
  wzy authored Sep 01, 2022
  
  bc06920d
- Merge branch 'jinfa-0518' into 'jinfa-0518' · fde4039b
  前端-吴智勇 authored Sep 01, 2022
```
Jinfa 0518

See merge request project/jinfa-platform!317
```
  fde4039b
- Merge branch 'jinfa-0518' of… · 4fc04521
  wzy authored Sep 01, 2022
```
Merge branch 'jinfa-0518' of ssh://gitlab.shushangyun.com:8122/project/jinfa-platform into jinfa-0518
```
  4fc04521
- fix: 合同修改-物料时间回显问题 · f00d0b3c
  wzy authored Sep 01, 2022
  
  f00d0b3c
31 Aug, 2022 2 commits
- Merge branch 'jinfa-0518' into 'jinfa-0518' · 12575786
  前端-吴智勇 authored Aug 31, 2022
```
Jinfa 0518

See merge request project/jinfa-platform!316
```
  12575786
- Merge branch 'jinfa-0518' of… · b7e6a801
  wzy authored Aug 31, 2022
```
Merge branch 'jinfa-0518' of ssh://gitlab.shushangyun.com:8122/project/jinfa-platform into jinfa-0518
```
  b7e6a801