Commits · 5e8d764486676d25ecc25f61205a0c0d5f784f44 · lanbaoming / jiedao-api-boot-master

04 Sep, 2024 21 commits
- Merge branch 'release-fix' into release · 5e8d7644
  yanghao authored Sep 04, 2024
  
  5e8d7644
- chore: 添加客户查询 · add30e5e
  yanghao authored Sep 04, 2024
  
  add30e5e
- 订单复制部分业务代码提交 · e5c1b062
  332784038@qq.com authored Sep 04, 2024
  
  e5c1b062
- Merge branch 'master-shw' into release · b274f96f
  332784038@qq.com authored Sep 04, 2024
```
# Conflicts:
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/dict/core/util/DictFrameworkUtils.java
```
  b274f96f
- sql修复 · 5457e14c
  332784038@qq.com authored Sep 04, 2024
  
  5457e14c
- 订单列表返回提货率 · 1edc3b18
  332784038@qq.com authored Sep 04, 2024
  
  1edc3b18
- 补充提货率和提货状态到订单中进行查询(主动跟进提货状态和提货率到订单中需要另行业务处理) · 6c8930e4
  332784038@qq.com authored Sep 04, 2024
  
  6c8930e4
- 订单收发货人跟进客服查询返回 · f1907a45
  332784038@qq.com authored Sep 04, 2024
  
  f1907a45
- 订单列表查询返回收发货人客户id和客户编号 · 23a4f64b
  332784038@qq.com authored Sep 04, 2024
  
  23a4f64b
- 手机号验证 · b9e1b836
  joy authored Sep 04, 2024
  
  b9e1b836
- 补充刷新订单收发货人信息数据脚本 · de62364e
  332784038@qq.com authored Sep 04, 2024
  
  de62364e
- 订单相关业务逻辑变动 · 453d0100
  332784038@qq.com authored Sep 04, 2024
  
  453d0100
- 新增字段sql脚本 · b1b1b70d
  332784038@qq.com authored Sep 04, 2024
  
  b1b1b70d
- 订单状态查询参数传递封装bug解决 · adb1330c
  332784038@qq.com authored Sep 04, 2024
  
  adb1330c
- Merge branch 'release-fix' into release · b2560fd5
  332784038@qq.com authored Sep 04, 2024
  
  b2560fd5
- 提单制作的查询中对无发货人的订单bug做兼容处理 · ae6857ff
  332784038@qq.com authored Sep 04, 2024
  
  ae6857ff
- Merge branch 'release-fix' into release · 27278b49
  332784038@qq.com authored Sep 04, 2024
  
  27278b49
- Merge remote-tracking branch 'origin/release-fix' into release-fix · 501f413a
  332784038@qq.com authored Sep 04, 2024
  
  501f413a
- 订单查询状态封装bug修复 · 49f0d239
  332784038@qq.com authored Sep 04, 2024
  
  49f0d239
- Merge branch 'release-bugfix-166' into 'release' · a602ac10
  zhangfeng authored Sep 04, 2024
```
bugfix-166: 积分不足显示程序码

See merge request !14
```
  a602ac10
- bugfix-166: 积分不足显示程序码 · 679fafa2
  zhangfeng authored Sep 04, 2024
  
  679fafa2
03 Sep, 2024 12 commits
- Merge branch 'release-zf' into 'release' · 1103043b
  zhangfeng authored Sep 03, 2024
```
bugfix-172,175,180,181,186

See merge request !13
```
  1103043b
- bugfix-172: 兑换记录ID命名规则修改 · 285a39fa
  zhangfeng authored Sep 03, 2024
  
  285a39fa
- bugfix-175: 礼品ID命名规则修改 · 5dc74d01
  zhangfeng authored Sep 03, 2024
  
  5dc74d01
- bugfix-180: 手机号码搜索后点击会员名称显示异常 · 7fd1578e
  zhangfeng authored Sep 03, 2024
  
  7fd1578e
- bugfix-181: 积分规则唯一性更改提示词 · 95bc56d1
  zhangfeng authored Sep 03, 2024
  
  95bc56d1
- bugfix-186: 后台新增兑换记录收件人姓名，电话，地址必填项改为非必填 · e4117073
  zhangfeng authored Sep 03, 2024
  
  e4117073
- chore: 客户详情添加缺失的返回数据 · 9dcc4893
  yanghao authored Sep 03, 2024
  
  9dcc4893
- chore: 客户详情添加缺失的返回数据 · 410962d0
  yanghao authored Sep 03, 2024
  
  410962d0
- chore: 添加默认开票的修改接口 · 48b44c53
  yanghao authored Sep 03, 2024
  
  48b44c53
- 返回放货锁定收货人天数 · e641a573
  332784038@qq.com authored Sep 03, 2024
  
  e641a573
- Merge branch 'release-fix' into release · 299d235b
  332784038@qq.com authored Sep 03, 2024
  
  299d235b
- sql修复 · 1e0ae5f6
  332784038@qq.com authored Sep 03, 2024
  
  1e0ae5f6
02 Sep, 2024 7 commits
- Merge branch 'release-fix' into release · ecb07228
  zhengyi authored Sep 02, 2024
  
  ecb07228
- 订单多状态转换bug修复 · 98a18787
  zhengyi authored Sep 02, 2024
  
  98a18787
- Merge branch 'release-fix' into release · 35c73cd1
  zhengyi authored Sep 02, 2024
  
  35c73cd1
- 控货订单多控货状态查询bug修复 · 9749efb6
  zhengyi authored Sep 02, 2024
  
  9749efb6
- Merge branch 'release-fix' into release · be374b20
  zhengyi authored Sep 02, 2024
  
  be374b20
- Merge remote-tracking branch 'origin/release-fix' into release-fix · 37a0a2fd
  zhengyi authored Sep 02, 2024
  
  37a0a2fd
- 1、控货订单列表的控货状态多条件查询完善 · 5b1552af
  zhengyi authored Sep 02, 2024
```
2、订单列表补充商品类型多条件查询
```
  5b1552af