Commits · f70a8bc1a5cabdc40c47f8849b975a319c24ba6b · lanbaoming / jiedao-app-operator-master

19 Sep, 2024 1 commit
- 合并客户2，客户信息显示 · f70a8bc1
  yujinyao authored Sep 19, 2024
  
  f70a8bc1
18 Sep, 2024 1 commit
- 合并客户弹框 · 50834765
  yujinyao authored Sep 18, 2024
  
  50834765
13 Sep, 2024 18 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
- 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 13 commits
- 异常订单去掉状态筛选 · 79a51e7c
  dragondean@qq.com authored Sep 12, 2024
  
  79a51e7c
- Merge remote-tracking branch 'origin/pre-release' into pre-release · ffbb23d2
  dragondean@qq.com authored Sep 12, 2024
  
  ffbb23d2
- Merge branch 'feature/order_edit' into pre-release · 48a0ba38
  dragondean@qq.com authored Sep 12, 2024
  
  48a0ba38
- 修复几个编辑订单和详情的bug · 1313a511
  dragondean@qq.com authored Sep 12, 2024
  
  1313a511
- 异常订单重置商品类型 · 00937a5b
  余金瑶 authored Sep 12, 2024
  
  00937a5b
- 修改客户信息界面，控货和异常订单搜索 · 39fc4430
  余金瑶 authored Sep 12, 2024
  
  39fc4430
- Merge branch 'hotfix/preReleaseDefect' into 'pre-release' · 41628737
  chenwei authored Sep 12, 2024
```
Hotfix/pre release defect

See merge request !44
```
  41628737
- 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 'hotfix/preReleaseDefect' into 'pre-release' · a299f73f
  chenwei authored Sep 12, 2024
```
Hotfix/pre release defect

See merge request !41
```
  a299f73f
- Merge branch 'feature/099_customer_filter' into 'hotfix/preReleaseDefect' · b5d38eb3
  chenwei authored Sep 12, 2024
```
Feature/099 customer filter

See merge request !40
```
  b5d38eb3
- Merge remote-tracking branch 'origin/pre-release' into pre-release · 59c5853b
  dragondean@qq.com authored Sep 12, 2024
  
  59c5853b
- 几个小bug · 41bf70a6
  dragondean@qq.com authored Sep 12, 2024
  
  41bf70a6
11 Sep, 2024 7 commits
- 客户页面布局 · 12955a48
  yujinyao authored Sep 11, 2024
  
  12955a48
- 客户设置开关参数重置 · e2233622
  yujinyao authored Sep 11, 2024
  
  e2233622
- 客户跟进选择报价单，加客户编号，始发地和渠道 · 1c49f721
  yujinyao authored Sep 11, 2024
  
  1c49f721
- Merge branch 'pre-release' of... · f60671ef
  yujinyao authored Sep 11, 2024
```
Merge branch 'pre-release' of http://110.41.143.128:8081/lanbaoming/jiedao-app-operator-master into yujinyao
```
  f60671ef
- 客户设置2 · 8c2c8d43
  yujinyao authored Sep 11, 2024
  
  8c2c8d43
- 客户设置 · 61f0c4bb
  yujinyao authored Sep 11, 2024
  
  61f0c4bb
- 修复部分bug · b8e88441
  dragondean@qq.com authored Sep 11, 2024
  
  b8e88441