Commits · 788fd006ef96dfa68662b9ac088569b4385d0a13 · lanbaoming / jiedao-api-boot-master

10 Jan, 2025 3 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
- Merge branch 'release' into 'jd_dev' · 8b081e7a
  Administrator authored Jan 10, 2025
```
Release分支合并到jd分支

See merge request !78
```
  8b081e7a
09 Jan, 2025 37 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
- bug编号154 后台-等级设置-新增/修改会员等级规则的校验逻辑未实现 2 · 3fbf8b76
  Smile authored Jan 07, 2025
  
  3fbf8b76
- app提示升级须知sql添加 · 97c99b52
  Smile authored Jan 07, 2025
  
  97c99b52
- SendChamp客户端接收状态默认为成功 · 3aafcb9b
  honghy authored Jan 07, 2025
  
  3aafcb9b
- 会员等级详情等级配置id可以为空sql修改 · cf318f50
  Smile authored Jan 07, 2025
  
  cf318f50
- 会员等级详情等级配置id可以为空sql修改 · 95603250
  Smile authored Jan 07, 2025
  
  95603250
- fix:手动更新会员等级信息后，等级记录中匹配规则不对。 · 3e6249a9
  Smile authored Jan 06, 2025
  
  3e6249a9
- 会员默认等级定时任务 · a82fa0d0
  Smile authored Jan 05, 2025
  
  a82fa0d0
- 会员等级配置等级有效期不能为空 · e2a7f601
  Smile authored Jan 04, 2025
  
  e2a7f601
- 会员等级配置，同等级相同顺序报错 · 1339b326
  Smile authored Jan 04, 2025
  
  1339b326
- 会员等级手动赋值导致无法登录问题修改 · b209b728
  Smile authored Jan 04, 2025
  
  b209b728
- 会员等级自动赋值，为0时出错 · e185b66d
  Smile authored Jan 03, 2025
  
  e185b66d
- 会员等级修改时页面等级无变化问题修改 · 813aaac8
  Smile authored Jan 03, 2025
  
  813aaac8
- 新增法文翻译 · 9fa070cc
  honghy authored Jan 03, 2025
  
  9fa070cc
- 会员等级修改，1.定时任务从高等级往下匹配，2.可手动设置等级 · 41c191d3
  Smile authored Jan 03, 2025
  
  41c191d3
- 等级启动禁用清空bug修改 · 44c56a7b
  honghy authored Jan 03, 2025
  
  44c56a7b
- Revert "fix:手动更新会员等级信息后，等级记录中匹配规则不对。" · 01f41691
  wux authored Jan 07, 2025
```
This reverts commit cd1173d7.
```
  01f41691
- Revert "会员默认等级定时任务" · 4984806c
  wux authored Jan 07, 2025
```
This reverts commit 35de14ba.
```
  4984806c
- Revert "会员等级配置等级有效期不能为空" · 93538150
  wux authored Jan 07, 2025
```
This reverts commit 710a7b68.
```
  93538150