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

08 Aug, 2024 2 commits
- Merge branch 'refs/heads/feature_member_score' into dev · a482bdb3
  zhangfeng authored Aug 08, 2024
  
  a482bdb3
- 异常类优化，双语配置 · 4de07c1d
  zhangfeng authored Aug 08, 2024
  
  4de07c1d
07 Aug, 2024 24 commits
- 海运应收汇总bug · 46c357ef
  huyf authored Aug 07, 2024
  
  46c357ef
- 海运应收汇总bug · 80193911
  huyf authored Aug 07, 2024
  
  80193911
- Merge branch 'refs/heads/feature_member_score' into dev · 8a65fd7b
  zhangfeng authored Aug 07, 2024
  
  8a65fd7b
- 异常类优化，双语配置 · 12f7c412
  zhangfeng authored Aug 07, 2024
  
  12f7c412
- 客户端兑换记录 · 7fd2097c
  zhangfeng authored Aug 07, 2024
  
  7fd2097c
- Merge branch 'refs/heads/feature_member_score' into dev · e8cd74aa
  zhangfeng authored Aug 07, 2024
  
  e8cd74aa
- 积分规则列表返回字段优化 · 62f23b58
  zhangfeng authored Aug 07, 2024
  
  62f23b58
- 异常类优化，双语配置 · 3ba25141
  zhangfeng authored Aug 07, 2024
  
  3ba25141
- Merge branch 'master-fix' into dev · 3481b43f
  332784038@qq.com authored Aug 07, 2024
  
  3481b43f
- 业绩计算逻辑bug修复 · 4e51ba9a
  332784038@qq.com authored Aug 07, 2024
  
  4e51ba9a
- 订单创建与编辑时的业绩计算逻辑bug修复 · 022aee9b
  332784038@qq.com authored Aug 07, 2024
  
  022aee9b
- 订单创建与编辑时的业绩计算逻辑bug修复 · c6977c3d
  332784038@qq.com authored Aug 07, 2024
  
  c6977c3d
- Merge branch 'refs/heads/feature_member_score' into dev · 9a97bd5a
  zhangfeng authored Aug 07, 2024
  
  9a97bd5a
- 客户端兑换礼品 · 3a84402f
  zhangfeng authored Aug 07, 2024
  
  3a84402f
- 客户端礼品列表 · 9bf98be2
  zhangfeng authored Aug 07, 2024
  
  9bf98be2
- Merge branch 'master-fix' into dev · 4f4ca8ce
  332784038@qq.com authored Aug 07, 2024
  
  4f4ca8ce
- 应收报表核算bug修复 · 8744a59c
  332784038@qq.com authored Aug 07, 2024
  
  8744a59c
- Merge branch 'refs/heads/feature_member_score' into dev · ab2626cc
  zhangfeng authored Aug 07, 2024
  
  ab2626cc
- 获得目的仓树形列表返回优化 · 6cc0b7df
  zhangfeng authored Aug 07, 2024
  
  6cc0b7df
- Merge remote-tracking branch 'origin/dev' into dev · 9be7e6ed
  zhangfeng authored Aug 07, 2024
  
  9be7e6ed
- Merge branch 'refs/heads/feature_member_score' into dev · 24f94d5f
  zhangfeng authored Aug 07, 2024
  
  24f94d5f
- Merge branch 'master-fix' into dev · 768c5a85
  332784038@qq.com authored Aug 07, 2024
  
  768c5a85
- 客户端用户地址管理 · 930bb1a7
  zhangfeng authored Aug 07, 2024
  
  930bb1a7
- fix: #176 订单创建，没有在客户档案写入日志。 · 1a756e50
  yanghao authored Aug 07, 2024
  
  1a756e50
06 Aug, 2024 14 commits
- 客户端兑换记录 · f6f1fad2
  zhangfeng authored Aug 06, 2024
  
  f6f1fad2
- Merge branch 'refs/heads/feature_member_score' into dev · adba3fe8
  zhangfeng authored Aug 06, 2024
  
  adba3fe8
- 订单V值VO调整 · 7ff95b93
  zhangfeng authored Aug 06, 2024
  
  7ff95b93
- 获得目的仓树形列表返回优化 · 3b3ffcf8
  zhangfeng authored Aug 06, 2024
  
  3b3ffcf8
- Merge branch 'master-fix' into dev · 36e2eb2c
  332784038@qq.com authored Aug 06, 2024
```
# Conflicts:
#	yudao-module-bpm/yudao-module-bpm-impl-flowable/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/script/impl/BpmTaskAssignLeaderAbstractScript.java
```
  36e2eb2c
- 会员下拉框列表查询需要排除已删除的会员信息 · ac158b7e
  332784038@qq.com authored Aug 06, 2024
  
  ac158b7e
- 积分基本信息，积分日志 · f9d6bf8f
  zhangfeng authored Aug 06, 2024
  
  f9d6bf8f
- 部门负责人发起流程找上级人审批 · a3ecc23b
  jiuping authored Aug 06, 2024
  
  a3ecc23b
- Merge remote-tracking branch 'origin/master' · c34bfa19
  332784038@qq.com authored Aug 06, 2024
  
  c34bfa19
- Merge remote-tracking branch 'origin/dev' into dev · 84569c6c
  jiuping authored Aug 06, 2024
  
  84569c6c
- 部门负责人发起流程找上级人审批 · 3a0247e9
  jiuping authored Aug 06, 2024
```
(cherry picked from commit bc7217ae)
```
  3a0247e9
- Merge branch 'master-fix' into dev · de921579
  332784038@qq.com authored Aug 06, 2024
  
  de921579
- 部门负责人发起流程找上级人审批 · bc7217ae
  jiuping authored Aug 06, 2024
  
  bc7217ae
- 批量修改海运价格时修改单询状态bug修复 · e868005e
  332784038@qq.com authored Aug 06, 2024
  
  e868005e