Commits · 1603d701b4e2384c0ec01129797261b76d93e4d3 · lanbaoming / jiedao-app-operator-master

06 Sep, 2024 8 commits
- Merge branch 'hotfix/preReleaseDefect' into 'pre-release' · 1603d701
  chenwei authored Sep 06, 2024
```
Hotfix/pre release defect

See merge request !34
```
  1603d701
- Merge branch 'cherry-pick-3d196b22' into 'hotfix/preReleaseDefect' · cb4f8c55
  chenwei authored Sep 06, 2024
```
Merge branch 'feature/099_customer_filter' into 'dev'

See merge request !33
```
  cb4f8c55
- Merge branch 'feature/099_customer_filter' into 'dev' · 9158702a
  chenwei authored Sep 06, 2024
```
兑换记录筛选新增兑换记录ID

See merge request !32

(cherry picked from commit 3d196b22)

7dbfdb1d 兑换记录筛选新增兑换记录ID
```
  9158702a
- Merge branch 'hotfix/preReleaseDefect' into 'pre-release' · 9540f96c
  chenwei authored Sep 06, 2024
```
Hotfix/pre release defect

See merge request !31
```
  9540f96c
- Merge branch 'cherry-pick-08db7893' into 'pre-release' · 715aee08
  chenwei authored Sep 06, 2024
```
Merge branch 'cherry-pick-761bb895' into 'hotfix/preReleaseDefect'

See merge request !30
```
  715aee08
- Merge branch 'cherry-pick-761bb895' into 'hotfix/preReleaseDefect' · 5c732dec
  chenwei authored Sep 06, 2024
```
Merge branch 'feature/099_customer_filter' into 'dev'

See merge request !29

(cherry picked from commit 08db7893)

fb6caff3 Merge branch 'feature/099_customer_filter' into 'dev'
```
  5c732dec
- Merge branch 'cherry-pick-761bb895' into 'hotfix/preReleaseDefect' · 08db7893
  chenwei authored Sep 06, 2024
```
Merge branch 'feature/099_customer_filter' into 'dev'

See merge request !29
```
  08db7893
- Merge branch 'feature/099_customer_filter' into 'dev' · fb6caff3
  chenwei authored Sep 06, 2024
```
问题修复

See merge request !28

(cherry picked from commit 761bb895)

1538ca7b 问题修复
```
  fb6caff3
05 Sep, 2024 7 commits
- 全部客户搜索 · c0aeb658
  余金瑶 authored Sep 05, 2024
  
  c0aeb658
- 客户跟进3 · 795f445f
  余金瑶 authored Sep 05, 2024
  
  795f445f
- Merge branch 'pre-release' of... · d818ef76
  yujinyao authored Sep 05, 2024
```
Merge branch 'pre-release' of http://110.41.143.128:8081/lanbaoming/jiedao-app-operator-master into yujinyao
```
  d818ef76
- 客户跟进2 · 72057481
  yujinyao authored Sep 05, 2024
  
  72057481
- Merge branch 'hotfix/preReleaseDefect' into 'pre-release' · b27c6b84
  chenwei authored Sep 05, 2024
```
Hotfix/pre release defect

See merge request !27
```
  b27c6b84
- Merge branch 'cherry-pick-30e7cfa4' into 'hotfix/preReleaseDefect' · 01f7747b
  chenwei authored Sep 05, 2024
```
Merge branch 'feature/099_customer_filter' into 'dev'

See merge request !26
```
  01f7747b
- Merge branch 'feature/099_customer_filter' into 'dev' · 9d1f4bd9
  chenwei authored Sep 05, 2024
```
修复问题

See merge request !25

(cherry picked from commit 30e7cfa4)

8849fbe9 修复问题
```
  9d1f4bd9
04 Sep, 2024 3 commits
- 客户跟进 · 2011369e
  yujinyao authored Sep 04, 2024
  
  2011369e
- Merge branch 'pre-release' of... · e6197a81
  yujinyao authored Sep 04, 2024
```
Merge branch 'pre-release' of http://110.41.143.128:8081/lanbaoming/jiedao-app-operator-master into yujinyao
```
  e6197a81
- 订单专线空运/空运待出查询加商品类型 · 4a6eee76
  yujinyao authored Sep 04, 2024
  
  4a6eee76
03 Sep, 2024 14 commits
- Merge branch 'hotfix/preReleaseDefect' into 'pre-release' · 994ad2ec
  chenwei authored Sep 03, 2024
```
会员详情跳转逻辑

See merge request !24
```
  994ad2ec
- 会员详情跳转逻辑 · a6b6c78c
  chenwei authored Sep 03, 2024
  
  a6b6c78c
- Merge branch 'pre-release' of... · 6072a08d
  yujinyao authored Sep 03, 2024
```
Merge branch 'pre-release' of http://110.41.143.128:8081/lanbaoming/jiedao-app-operator-master into yujinyao
```
  6072a08d
- 设置客户默认开票 · 4a576e44
  yujinyao authored Sep 03, 2024
  
  4a576e44
- Merge branch 'hotfix/preReleaseDefect' into 'pre-release' · 7aacc178
  chenwei authored Sep 03, 2024
```
Hotfix/pre release defect

See merge request !22
```
  7aacc178
- 修改会员详情页 · 7dac7713
  chenwei authored Sep 03, 2024
  
  7dac7713
- fixed defect · 1717637e
  chenwei authored Sep 03, 2024
  
  1717637e
- 客户信息添加主要竞争对象下拉框 · 5b7d46b4
  yujinyao authored Sep 03, 2024
  
  5b7d46b4
- Merge branch 'dev' of... · cc649a65
  yujinyao authored Sep 03, 2024
```
Merge branch 'dev' of http://110.41.143.128:8081/lanbaoming/jiedao-app-operator-master into yujinyao
```
  cc649a65
- 订单多状态搜索修复 · 21a04cc3
  yujinyao authored Sep 03, 2024
  
  21a04cc3
- Merge remote-tracking branch 'origin/dev' into dev · e5fd9477
  dragondean@qq.com authored Sep 03, 2024
  
  e5fd9477
- Merge branch 'feature/order_edit' into dev · 44558b1a
  dragondean@qq.com authored Sep 03, 2024
  
  44558b1a
- 编辑订单默认付款人调整 · 5c374463
  dragondean@qq.com authored Sep 03, 2024
  
  5c374463
- 我的订单客户经理，出货渠道多选 · 387dd2cc
  yujinyao authored Sep 03, 2024
  
  387dd2cc
02 Sep, 2024 2 commits
- Merge branch 'pre-release' of... · 30fb684f
  yujinyao authored Sep 02, 2024
```
Merge branch 'pre-release' of http://110.41.143.128:8081/lanbaoming/jiedao-app-operator-master into yujinyao
```
  30fb684f
- 客户设置默认付款和控货无收货人 · dd9d2183
  yujinyao authored Sep 02, 2024
  
  dd9d2183
31 Aug, 2024 6 commits
- Merge branch 'dev' of... · a14c124a
  余金瑶 authored Aug 31, 2024
```
Merge branch 'dev' of http://110.41.143.128:8081/lanbaoming/jiedao-app-operator-master into yujinyao
```
  a14c124a
- 订单兼容多状态查询 · 56d50f0e
  余金瑶 authored Aug 31, 2024
  
  56d50f0e
- Merge branch 'feature/cargo_control' into dev · 8f4ce90f
  dragondean@qq.com authored Aug 31, 2024
  
  8f4ce90f
- Merge branch 'feature/cargo_control' into pre-release · 77224146
  dragondean@qq.com authored Aug 31, 2024
  
  77224146
- 完善修改放货审批 · 4ef0d522
  dragondean@qq.com authored Aug 31, 2024
  
  4ef0d522
- Merge branch 'feature/order_edit' into dev · 2fbeef94
  dragondean@qq.com authored Aug 31, 2024
  
  2fbeef94