Commits · 0a8d6c8c1fa19124de3146a4f59007358faad2a4 · lanbaoming / jiedao-app-operator-master

07 Sep, 2024 5 commits
- Merge branch 'pre-release' into dev · 0a8d6c8c
  dragondean@qq.com authored Sep 07, 2024
```
# Conflicts:
#	src/i18n/languages/en_US.json
```
  0a8d6c8c
- Merge branch 'feature/order_edit' into pre-release · 5dc83634
  dragondean@qq.com authored Sep 07, 2024
  
  5dc83634
- 完善订单详情 · 0f24ef21
  dragondean@qq.com authored Sep 07, 2024
  
  0f24ef21
- 订单详情重构暂存 · e25386f4
  dragondean@qq.com authored Aug 27, 2024
  
  e25386f4
- 订单列表海外仓标记错误 · 8f8f7893
  dragondean@qq.com authored Sep 07, 2024
  
  8f8f7893
06 Sep, 2024 22 commits
- Merge branch 'pre-release' of... · dc62bd98
  yujinyao authored Sep 06, 2024
```
Merge branch 'pre-release' of http://110.41.143.128:8081/lanbaoming/jiedao-app-operator-master into yujinyao
```
  dc62bd98
- Merge branch 'feature/order_edit' into dev · 23a8228c
  dragondean@qq.com authored Sep 06, 2024
```
# Conflicts:
#	src/views/ecw/order/index.vue
```
  23a8228c
- Merge branch 'feature/order_edit' into pre-release · 6f0114a9
  dragondean@qq.com authored Sep 06, 2024
```
# Conflicts:
#	src/views/ecw/order/index.vue
```
  6f0114a9
- 订单复制和查看异常，列调整 · 240853aa
  dragondean@qq.com authored Sep 06, 2024
  
  240853aa
- Merge branch 'pre-release' of... · 99740436
  yujinyao authored Sep 06, 2024
```
Merge branch 'pre-release' of http://110.41.143.128:8081/lanbaoming/jiedao-app-operator-master into yujinyao
```
  99740436
- 订单列表加提货率和提货状态搜索 · e3b47daf
  yujinyao authored Sep 06, 2024
  
  e3b47daf
- Merge branch 'pre-release' of... · 8b866576
  dragondean@qq.com authored Sep 06, 2024
```
Merge branch 'pre-release' of http://110.41.143.128:8081/lanbaoming/jiedao-app-operator-master into pre-release
```
  8b866576
- 客户列表搜索部门 · 70855877
  yujinyao authored Sep 06, 2024
  
  70855877
- Merge branch 'pre-release' of... · a4082526
  yujinyao authored Sep 06, 2024
```
Merge branch 'pre-release' of http://110.41.143.128:8081/lanbaoming/jiedao-app-operator-master into yujinyao
```
  a4082526
- 客户列表搜索 · c0474454
  yujinyao authored Sep 06, 2024
  
  c0474454
- 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 'feature/099_customer_filter' into 'dev' · 3d196b22
  chenwei authored Sep 06, 2024
```
兑换记录筛选新增兑换记录ID

See merge request !32
```
  3d196b22
- 兑换记录筛选新增兑换记录ID · 7dbfdb1d
  chenwei authored Sep 06, 2024
  
  7dbfdb1d
- 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
- Merge branch 'feature/099_customer_filter' into 'dev' · 761bb895
  chenwei authored Sep 06, 2024
```
问题修复

See merge request !28
```
  761bb895
- 问题修复 · 1538ca7b
  chenwei authored Sep 06, 2024
  
  1538ca7b
05 Sep, 2024 9 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
- Merge branch 'feature/099_customer_filter' into 'dev' · 30e7cfa4
  chenwei authored Sep 05, 2024
```
修复问题

See merge request !25
```
  30e7cfa4
- 修复问题 · 8849fbe9
  chenwei authored Sep 05, 2024
  
  8849fbe9
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 1 commit
- Merge branch 'hotfix/preReleaseDefect' into 'pre-release' · 994ad2ec
  chenwei authored Sep 03, 2024
```
会员详情跳转逻辑

See merge request !24
```
  994ad2ec