Commits · 8c913f525f4301b289bfbe003b9083eaf662ec05 · lanbaoming / jiedao-app-operator-master

13 Sep, 2024 4 commits
- Merge branch 'feature/099_customer_filter' into 'hotfix/preReleaseDefect' · 8c913f52
  chenwei authored Sep 13, 2024
```
规则提交

See merge request !49
```
  8c913f52
- 规则提交 · 8f471e45
  chenwei authored Sep 13, 2024
  
  8f471e45
- Merge branch 'feature/099_customer_filter' into 'hotfix/preReleaseDefect' · c695c52c
  chenwei authored Sep 13, 2024
```
活动链接禁止编辑

See merge request !46
```
  c695c52c
- 活动链接禁止编辑 · 7910e01d
  chenwei authored Sep 13, 2024
  
  7910e01d
12 Sep, 2024 3 commits
- Merge branch 'feature/099_customer_filter' into 'hotfix/preReleaseDefect' · fed7e783
  chenwei authored Sep 12, 2024
```
问题修复，面包屑等等等

See merge request !43
```
  fed7e783
- 问题修复，面包屑等等等 · 8c4b47d8
  chenwei authored Sep 12, 2024
  
  8c4b47d8
- Merge branch 'feature/099_customer_filter' into 'hotfix/preReleaseDefect' · b5d38eb3
  chenwei authored Sep 12, 2024
```
Feature/099 customer filter

See merge request !40
```
  b5d38eb3
10 Sep, 2024 3 commits
- Merge branch 'cherry-pick-1150e645' into 'hotfix/preReleaseDefect' · 2a78f8f3
  chenwei authored Sep 10, 2024
```
Merge branch 'feature/099_customer_filter' into 'dev'

See merge request !36
```
  2a78f8f3
- Merge branch 'feature/099_customer_filter' into 'dev' · a4c28076
  chenwei authored Sep 10, 2024
```
问题汇总修改

See merge request !35

(cherry picked from commit 1150e645)

143227ff 问题汇总修改
```
  a4c28076
- 问题汇总修改 · 143227ff
  chenwei authored Sep 10, 2024
  
  143227ff
06 Sep, 2024 6 commits
- 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
- 兑换记录筛选新增兑换记录ID · 7dbfdb1d
  chenwei authored Sep 06, 2024
  
  7dbfdb1d
- 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
- 问题修复 · 1538ca7b
  chenwei authored Sep 06, 2024
  
  1538ca7b
05 Sep, 2024 3 commits
- 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
- 修复问题 · 8849fbe9
  chenwei authored Sep 05, 2024
  
  8849fbe9
03 Sep, 2024 13 commits
- 会员详情跳转逻辑 · a6b6c78c
  chenwei authored Sep 03, 2024
  
  a6b6c78c
- 会员详情跳转逻辑 · ff4def43
  chenwei authored Sep 03, 2024
  
  ff4def43
- 修改会员详情页 · 7dac7713
  chenwei authored Sep 03, 2024
  
  7dac7713
- fixed defect · 1717637e
  chenwei authored Sep 03, 2024
  
  1717637e
- 修改会员详情页 · 3f173b87
  chenwei authored Sep 03, 2024
  
  3f173b87
- fixed defect · e26685d3
  chenwei authored Sep 03, 2024
  
  e26685d3
- 客户信息添加主要竞争对象下拉框 · 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