Commits · 4d89ff65523509a3885d525f8952fa7565c4178f · lanbaoming / jiedao-app-operator-master

13 Sep, 2024 6 commits
- Merge branch 'feature/099_customer_filter' into 'dev' · 4d89ff65
  chenwei authored Sep 13, 2024
```
分享触发时间问题和积分规则回显问题

See merge request !51
```
  4d89ff65
- 分享触发时间问题和积分规则回显问题 · 46a6fd93
  chenwei authored Sep 13, 2024
  
  46a6fd93
- Merge branch 'feature/099_customer_filter' into 'dev' · 9336e98b
  chenwei authored Sep 13, 2024
```
规则提交

See merge request !48
```
  9336e98b
- 规则提交 · 8f471e45
  chenwei authored Sep 13, 2024
  
  8f471e45
- Merge branch 'feature/099_customer_filter' into 'dev' · f8e23dbc
  chenwei authored Sep 13, 2024
```
活动链接禁止编辑

See merge request !45
```
  f8e23dbc
- 活动链接禁止编辑 · 7910e01d
  chenwei authored Sep 13, 2024
  
  7910e01d
12 Sep, 2024 2 commits
- Merge branch 'feature/099_customer_filter' into 'dev' · 690bfd59
  chenwei authored Sep 12, 2024
```
问题修复，面包屑等等等

See merge request !42
```
  690bfd59
- 问题修复，面包屑等等等 · 8c4b47d8
  chenwei authored Sep 12, 2024
  
  8c4b47d8
10 Sep, 2024 2 commits
- Merge branch 'feature/099_customer_filter' into 'dev' · 1150e645
  chenwei authored Sep 10, 2024
```
问题汇总修改

See merge request !35
```
  1150e645
- 问题汇总修改 · 143227ff
  chenwei authored Sep 10, 2024
  
  143227ff
08 Sep, 2024 8 commits
- Merge branch 'pre-release' into dev · d0a9da58
  dragondean@qq.com authored Sep 08, 2024
  
  d0a9da58
- Merge remote-tracking branch 'origin/dev' into dev · 06775a0c
  dragondean@qq.com authored Sep 08, 2024
  
  06775a0c
- Merge remote-tracking branch 'origin/pre-release' into pre-release · eb9e7f83
  dragondean@qq.com authored Sep 08, 2024
  
  eb9e7f83
- Merge branch 'feature/order_edit' into pre-release · 27d547ac
  dragondean@qq.com authored Sep 08, 2024
  
  27d547ac
- 完善订单编辑 · bd3513e7
  dragondean@qq.com authored Sep 08, 2024
  
  bd3513e7
- 控货订单加提货状态和提货率 · eda6d1a7
  余金瑶 authored Sep 08, 2024
  
  eda6d1a7
- 订单列表收货人、发货人编号支持穿越 · 5a03c55e
  余金瑶 authored Sep 08, 2024
  
  5a03c55e
- 客户列表字段 · 93820aca
  余金瑶 authored Sep 08, 2024
  
  93820aca
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 17 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