Commits · e185b66dd3b6b32482b3cc4dfb3b7318de5fd3cf · lanbaoming / jiedao-api-boot-master

09 Jan, 2025 24 commits
- 会员等级自动赋值，为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
- Revert "会员等级配置，同等级相同顺序报错" · 11d9dfbc
  wux authored Jan 07, 2025
```
This reverts commit c1506b2a.
```
  11d9dfbc
- Revert "会员等级手动赋值导致无法登录问题修改" · 976157fe
  wux authored Jan 07, 2025
```
This reverts commit e2013637.
```
  976157fe
- Revert "会员等级自动赋值，为0时出错" · 633fc5ec
  wux authored Jan 07, 2025
```
This reverts commit d76a233a.
```
  633fc5ec
- 会员等级配置，同等级相同顺序报错 · a9fd4c0f
  Smile authored Jan 04, 2025
  
  a9fd4c0f
- bug编号154 后台-等级设置-新增/修改会员等级规则的校验逻辑未实现 · c1fc2206
  Smile authored Jan 07, 2025
  
  c1fc2206
- fix:手动更新会员等级信息后，等级记录中匹配规则不对。 · c3eb1032
  Smile authored Jan 06, 2025
  
  c3eb1032
- 会员默认等级定时任务 · 7b8fd244
  Smile authored Jan 05, 2025
  
  7b8fd244
- 会员等级配置等级有效期不能为空 · 6b577fa3
  Smile authored Jan 04, 2025
  
  6b577fa3
- 会员等级配置，同等级相同顺序报错 · 402c0a8f
  Smile authored Jan 04, 2025
  
  402c0a8f
- 会员等级手动赋值导致无法登录问题修改 · 93614a49
  Smile authored Jan 04, 2025
  
  93614a49
- 会员等级自动赋值，为0时出错 · 74e022bb
  Smile authored Jan 03, 2025
  
  74e022bb
- 会员等级修改时页面等级无变化问题修改 · b7dc2e4e
  Smile authored Jan 03, 2025
  
  b7dc2e4e
- 新增法文翻译 · bf44b0a0
  honghy authored Jan 03, 2025
  
  bf44b0a0
- 会员等级修改，1.定时任务从高等级往下匹配，2.可手动设置等级 · 7f77896b
  Smile authored Jan 03, 2025
  
  7f77896b
- 等级启动禁用清空bug修改 · 8fe46b79
  honghy authored Jan 03, 2025
  
  8fe46b79
- 拆单订单编辑bug修复 · 6ac38f2d
  332784038@qq.com authored Jan 09, 2025
  
  6ac38f2d
08 Jan, 2025 5 commits
- SendChamp客户端修改发送参数格式 · 069e192f
  honghy authored Jan 07, 2025
  
  069e192f
- SendChamp客户端修改发送参数格式 · bccbd8cd
  honghy authored Jan 07, 2025
  
  bccbd8cd
- SendChamp客户端修改发送参数格式 · 3da8fda1
  honghy authored Jan 07, 2025
  
  3da8fda1
- SendChamp客户端发送账号改成ECLogistics · a0ccb4a5
  honghy authored Jan 07, 2025
  
  a0ccb4a5
- bug143:NG2422066L订单，已提货订单状态没有更新，提货率也没有更新 · 382d89fb
  honghy authored Jan 07, 2025
  
  382d89fb
07 Jan, 2025 7 commits
- 出货阶段的入仓追加与入仓修改操作日志说明文案修正 · 51066587
  zhengyi authored Jan 07, 2025
  
  51066587
- 出货阶段的入仓追加与入仓修改操作日志说明文案修正 · a5db7aca
  zhengyi authored Jan 07, 2025
  
  a5db7aca
- 出货阶段的入仓追加与入仓修改操作日志说明文案修正 · 8c09787d
  zhengyi authored Jan 03, 2025
  
  8c09787d
- 入仓修改或入仓追加审批通过后，需要重置可能存在的提单 · e4233942
  zhengyi authored Jan 03, 2025
  
  e4233942
- 放开卸柜到仓后的订单信息修改业务 · 70ebd8e1
  332784038@qq.com authored Jan 07, 2025
  
  70ebd8e1
- 提单编辑列表过滤未入仓的产品信息 · c76f6f59
  332784038@qq.com authored Jan 07, 2025
  
  c76f6f59
- 出货阶段入仓修改后未产生应收单的问题修复 · 85c95eeb
  332784038@qq.com authored Jan 07, 2025
  
  85c95eeb
06 Jan, 2025 1 commit

332784038@qq.com authored Jan 06, 2025

# Conflicts:
#	yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderWarehouseIn/OrderWarehouseInServiceImpl.java

36984582

03 Jan, 2025 3 commits
- bug修复 · 14e7e9f8
  332784038@qq.com authored Jan 03, 2025
  
  14e7e9f8
- 订单编辑审批业务补充 · 1005d54e
  332784038@qq.com authored Jan 03, 2025
  
  1005d54e
- 订单修改审批通过后处理如此异常的业务bug修复 · ffeb1cd2
  332784038@qq.com authored Jan 03, 2025
  
  ffeb1cd2