Commits · 29eb4633c45c695227ecff4d4c514ef07f29108f · lanbaoming / jiedao-api-boot-master · GitLab

14 Jan, 2025 9 commits
- Merge remote-tracking branch 'origin/jd_dev' into jd_dev · 29eb4633
  wux authored Jan 14, 2025
  
  29eb4633
- bug:186 修改查询语句屏蔽关联订单ID在订单表不存在的数据 · 252ac2b8
  wux authored Jan 14, 2025
  
  252ac2b8
- bug:186 修改查询语句屏蔽关联订单ID在订单表不存在的数据 · bb40da06
  wux authored Jan 14, 2025
  
  bb40da06
- bug181客户经理接收客户，没有赋值归属时间 · 396f8ae1
  honghy authored Jan 14, 2025
  
  396f8ae1
- 需求86 客户投诉页面和列表调整 · 40c1bde0
  knight authored Jan 14, 2025
  
  40c1bde0
- 修复由于联系人中关联会员ID为0导致不能入仓的问题 · 994f0d2d
  wux authored Jan 14, 2025
  
  994f0d2d
- bug182客户注册，创建人没有赋值 · 96e2a33f
  honghy authored Jan 14, 2025
  
  96e2a33f
- bug184: (生产)【(APP/h5)】首页弹窗，无法文显示 · 075438d9
  Smile authored Jan 14, 2025
  
  075438d9
- 订单更改不更新订单状态 · ca0f0249
  wux authored Jan 14, 2025
  
  ca0f0249
13 Jan, 2025 6 commits
- 会员积分规则匹配，当有两个不相冲突的积分规则，只匹配一个问题修改 · 320d418b
  Smile authored Jan 13, 2025
  
  320d418b
- 任务88：客户端改造，首页添加查询 · be98ad64
  Smile authored Jan 13, 2025
  
  be98ad64
- 会员积分规则匹配，当有两个不相冲突的积分规则，只匹配一个问题修改 · 8346cf71
  Smile authored Jan 13, 2025
  
  8346cf71
- Merge remote-tracking branch 'origin/jd_dev' into jd_dev · 8b00c640
  Smile authored Jan 13, 2025
  
  8b00c640
- 设为免泡按钮菜单sql提交 · c4861162
  Smile authored Jan 13, 2025
  
  c4861162
- Merge branch 'release' into 'jd_dev' · 7661f1fa
  Administrator authored Jan 13, 2025
```
Release分支合并到jd分支0113

See merge request !79
```
  7661f1fa
11 Jan, 2025 2 commits
- fix: 云效 JDAA-245: 6.装柜页面，NG2500009L 没有显示储位 · 7bc11d44
  yanghao authored Jan 11, 2025
```
(cherry picked from commit 320288ca)
```
  7bc11d44
- fix: 云效 JDAA-241： 2.NG2500008L 点击关联单，无需显示NG2500008L 的订单信息关联单 · 7f5e7224
  yanghao authored Jan 11, 2025
```
(cherry picked from commit a3a9def4)
```
  7f5e7224
10 Jan, 2025 4 commits
- Merge remote-tracking branch 'origin/jd_dev' into jd_dev · 788fd006
  Smile authored Jan 10, 2025
  
  788fd006
- bug175:(生产)会员-积分记录订单v值积分规则设置的是收货人，发货人也产生了积分记录。 · 4e5fc496
  Smile authored Jan 10, 2025
  
  4e5fc496
- feat(wealth): 优化 · f857a43a
  zhangfeng authored Jan 10, 2025
  
  f857a43a
- Merge branch 'release' into 'jd_dev' · 8b081e7a
  Administrator authored Jan 10, 2025
```
Release分支合并到jd分支

See merge request !78
```
  8b081e7a
09 Jan, 2025 19 commits
- feat(wealth): 批量创建收款单 · 61f8bdf2
  zhangfeng authored Jan 08, 2025
  
  61f8bdf2
- bug169 (生产bug)对订单进行调仓时，快速重复提交时，订单动态错误 · 17114ec4
  honghy authored Jan 09, 2025
  
  17114ec4
- Update application.yaml · b281554a
  Administrator authored Jan 09, 2025
  
  b281554a
- bug162 预装页面，调仓订单数据显示和统计问题 · 24d82706
  honghy authored Jan 09, 2025
  
  24d82706
- bug162 预装页面，调仓订单数据显示和统计问题 · 4ce2a1d7
  honghy authored Jan 09, 2025
  
  4ce2a1d7
- 引入包 · 3c7f6c69
  Smile authored Jan 09, 2025
  
  3c7f6c69
- 引入包 · 31b217ae
  Smile authored Jan 09, 2025
  
  31b217ae
- 等级配置日志记录类全称使用 · b53c17ad
  Smile authored Jan 09, 2025
  
  b53c17ad
- 提交 · 8e8559ad
  Smile authored Jan 09, 2025
  
  8e8559ad
- 等级配置日志记录类全称使用 · f434980d
  Smile authored Jan 09, 2025
  
  f434980d
- 提交 · 02d8d7a6
  Smile authored Jan 09, 2025
  
  02d8d7a6
- Merge branch 'master-fix' into release · 9884cd47
  332784038@qq.com authored Jan 09, 2025
  
  9884cd47
- 入仓订单修改重新匹配优惠业务bug修复 · 1d4a4eb1
  332784038@qq.com authored Jan 09, 2025
  
  1d4a4eb1
- Merge branch 'master-fix' into release · a067cde6
  332784038@qq.com authored Jan 09, 2025
```
# Conflicts:
#	sql/v2.3/20250107lh.sql
#	yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/service/score/MemberUserScoreServiceImpl.java
```
  a067cde6
- 会员等级在app和web上多语言显示问题修改 · 6be976d5
  Smile authored Jan 08, 2025
  
  6be976d5
- bug162 预装页面，调仓订单数据显示和统计问题 · 99ae5185
  honghy authored Jan 08, 2025
  
  99ae5185
- 手动设置会员等级，会员等级在app和web上不显示 · 409473d8
  Smile authored Jan 08, 2025
  
  409473d8
- 会员等级在app和web上多语言显示问题修改 · 91be4ae3
  Smile authored Jan 08, 2025
  
  91be4ae3
- 手动设置会员等级，会员等级在app和web上不显示 · 471f7c27
  Smile authored Jan 08, 2025
  
  471f7c27