Commits · 652b3a8899a7f654b7a5c99b3fb38b24a6fa16e7 · lanbaoming / jiedao-app-operator-master

20 Sep, 2024 2 commits
- Merge branch 'pre-release' of... · 652b3a88
  yujinyao authored Sep 20, 2024
```
Merge branch 'pre-release' of http://110.41.143.128:8081/lanbaoming/jiedao-app-operator-master into yujinyao
```
  652b3a88
- 修改新建报价单页面布局 · 38b9b4e2
  yujinyao authored Sep 20, 2024
  
  38b9b4e2
19 Sep, 2024 17 commits
- Merge branch 'feature/099_customer_filter' into 'pre-release' · c3ec27a3
  chenwei authored Sep 19, 2024
```
提货点

See merge request !70
```
  c3ec27a3
- 提货点 · 572563c8
  chenwei authored Sep 19, 2024
  
  572563c8
- Merge branch 'feature/099_customer_filter' into 'pre-release' · 2ae030c5
  chenwei authored Sep 19, 2024
```
提交更改

See merge request !68
```
  2ae030c5
- 提交更改 · 8f3dd336
  chenwei authored Sep 19, 2024
  
  8f3dd336
- 客户详情-特殊设置页签到仓确认显示 · 83244a85
  yujinyao authored Sep 19, 2024
  
  83244a85
- en_US.json文件冲突 · d2886449
  yujinyao authored Sep 19, 2024
  
  d2886449
- 合并客户2，客户信息显示 · f70a8bc1
  yujinyao authored Sep 19, 2024
  
  f70a8bc1
- Merge branch 'feature/099_customer_filter' into 'pre-release' · 1f2b8f6b
  chenwei authored Sep 19, 2024
```
Feature/099 customer filter

See merge request !65
```
  1f2b8f6b
- 兑换路径 · f7e88956
  chenwei authored Sep 19, 2024
  
  f7e88956
- 批量兑换页 · e52e91ea
  chenwei authored Sep 19, 2024
  
  e52e91ea
- 增加区号显示 · 7830e9a1
  joy authored Sep 18, 2024
```
(cherry picked from commit 2d4f54e2)
```
  7830e9a1
- Merge branch 'feature/099_customer_filter' into 'pre-release' · 8b97db36
  chenwei authored Sep 19, 2024
```
积分规则

See merge request !61
```
  8b97db36
- 积分规则 · 14d4650b
  chenwei authored Sep 19, 2024
  
  14d4650b
- Merge branch 'hotfix/preReleaseDefect' into 'pre-release' · f9aafea4
  chenwei authored Sep 19, 2024
```
Hotfix/pre release defect

See merge request !59
```
  f9aafea4
- Merge branch 'feature/099_customer_filter' into 'hotfix/preReleaseDefect' · 3abeab5a
  chenwei authored Sep 19, 2024
```
Feature/099 customer filter

See merge request !58
```
  3abeab5a
- 侧边栏重新排序 · 0fc09ef3
  chenwei authored Sep 19, 2024
  
  0fc09ef3
- 更改修复优化问题24-9/19 · 138c23cf
  chenwei authored Sep 19, 2024
  
  138c23cf
18 Sep, 2024 4 commits
- Merge branch 'zs-tmp' into pre-release · f17d99e8
  332784038@qq.com authored Sep 18, 2024
  
  f17d99e8
- 处理格式化冲突 · 322c0756
  332784038@qq.com authored Sep 18, 2024
  
  322c0756
- 6 · 7386277b
  332784038@qq.com authored Sep 18, 2024
  
  7386277b
- 合并客户弹框 · 50834765
  yujinyao authored Sep 18, 2024
  
  50834765
14 Sep, 2024 1 commit
- 6 · 541ade3b
  332784038@qq.com authored Sep 14, 2024
  
  541ade3b
13 Sep, 2024 16 commits
- Merge branch 'feature/order_edit' into pre-release · f59c28a4
  dragondean@qq.com authored Sep 13, 2024
```
# Conflicts:
#	src/views/ecw/order/index.vue
```
  f59c28a4
- 修复部分订单报错 · f7107ee8
  dragondean@qq.com authored Sep 13, 2024
  
  f7107ee8
- Merge branch 'hotfix/preReleaseDefect' into 'pre-release' · c93e8f1a
  chenwei authored Sep 13, 2024
```
Hotfix/pre release defect

See merge request !56
```
  c93e8f1a
- Merge branch 'feature/099_customer_filter' into 'hotfix/preReleaseDefect' · cbdb340e
  chenwei authored Sep 13, 2024
```
新增详情页

See merge request !55
```
  cbdb340e
- 新增详情页 · cb5a7436
  chenwei authored Sep 13, 2024
  
  cb5a7436
- Merge branch 'hotfix/preReleaseDefect' into 'pre-release' · 7f47ae84
  chenwei authored Sep 13, 2024
```
Hotfix/pre release defect

See merge request !53
```
  7f47ae84
- Merge branch 'feature/099_customer_filter' into 'hotfix/preReleaseDefect' · c5a873c8
  chenwei authored Sep 13, 2024
```
分享触发时间问题和积分规则回显问题

See merge request !52
```
  c5a873c8
- 分享触发时间问题和积分规则回显问题 · 46a6fd93
  chenwei authored Sep 13, 2024
  
  46a6fd93
- 异常订单去掉文本框空格 · 7ca7b1fb
  yujinyao authored Sep 13, 2024
  
  7ca7b1fb
- 控货订单特需搜索，列表加放货率和提货率字段 · 262bb6af
  yujinyao authored Sep 13, 2024
  
  262bb6af
- Merge branch 'pre-release' of... · 24e921be
  yujinyao authored Sep 13, 2024
```
Merge branch 'pre-release' of http://110.41.143.128:8081/lanbaoming/jiedao-app-operator-master into yujinyao
```
  24e921be
- 客户列表判断入仓确认条件 · e3cf4060
  yujinyao authored Sep 13, 2024
  
  e3cf4060
- Merge branch 'hotfix/preReleaseDefect' into 'pre-release' · 384eec17
  chenwei authored Sep 13, 2024
```
Hotfix/pre release defect

See merge request !50
```
  384eec17
- 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 'hotfix/preReleaseDefect' into 'pre-release' · cb4abdf9
  chenwei authored Sep 13, 2024
```
Hotfix/pre release defect

See merge request !47
```
  cb4abdf9