Commits · 8fed62d8ed0dd6cb22fdce4f14c68bbcf0a49b69 · lanbaoming / jiedao-api-boot-master · GitLab

06 Sep, 2024 2 commits
- Merge branch 'master-billOfLading-fix' into release · 8fed62d8
  332784038@qq.com authored Sep 06, 2024
  
  8fed62d8
- 提单金额bug补充修复 · 309f888f
  332784038@qq.com authored Sep 06, 2024
  
  309f888f
05 Sep, 2024 10 commits
- Merge branch 'release-fix' into release · eab50492
  332784038@qq.com authored Sep 05, 2024
  
  eab50492
- 是否有收货人查询条件补充 · 7c8be878
  332784038@qq.com authored Sep 05, 2024
  
  7c8be878
- sql修复 · 9f32b508
  332784038@qq.com authored Sep 05, 2024
  
  9f32b508
- Merge branch 'release-fix' into release · d0cf3625
  332784038@qq.com authored Sep 05, 2024
  
  d0cf3625
- Merge remote-tracking branch 'origin/release-fix' into release-fix · a47c2b86
  332784038@qq.com authored Sep 05, 2024
  
  a47c2b86
- 完善web-app端与管理端复制订单业务 · e1503e42
  332784038@qq.com authored Sep 05, 2024
  
  e1503e42
- Merge branch 'release-bugfix-zhangfeng' into 'release' · ed6f5ec1
  zhangfeng authored Sep 05, 2024
```
Release bugfix zhangfeng

See merge request !15
```
  ed6f5ec1
- bugfix-205: 订单V值提货点支持全选 · 74783bc5
  zhangfeng authored Sep 05, 2024
  
  74783bc5
- bugfix-204: 兑换记录筛选项新增兑换记录ID · 47d04fab
  zhangfeng authored Sep 05, 2024
  
  47d04fab
- bugfix-209: 积分规则列表添加编号 · cc1c8d5d
  zhangfeng authored Sep 05, 2024
  
  cc1c8d5d
04 Sep, 2024 24 commits
- Merge branch 'release-fix' into release · 2d917bd9
  yanghao authored Sep 04, 2024
  
  2d917bd9
- chore: 优化，将客户页面的查询都调整到客户分页的方法上，避免重复写。 · 10f2983e
  yanghao authored Sep 04, 2024
  
  10f2983e
- fix: 客户业绩类型查询时名称错误的bug修复 · 2755425c
  yanghao authored Sep 04, 2024
  
  2755425c
- 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 4 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