Commits · 102847c55839c5835cfb23cd9588509df8b02c1a · lanbaoming / jiedao-api-boot-master · GitLab

21 Aug, 2024 9 commits
- Merge branch 'refs/heads/feature_member_score' into dev · 102847c5
  zhangfeng authored Aug 21, 2024
  
  102847c5
- Merge branch 'refs/heads/feature_member_score_zhangfeng' into feature_member_score · fcec6796
  zhangfeng authored Aug 21, 2024
  
  fcec6796
- 会员积分总览特殊查询条件处理 · 4ab45806
  zhangfeng authored Aug 21, 2024
  
  4ab45806
- 兑换记录导入无记录报错 · 94bd5d5e
  zhangfeng authored Aug 21, 2024
  
  94bd5d5e
- Merge branch 'master-fix' into dev · 9b0c5224
  332784038@qq.com authored Aug 21, 2024
  
  9b0c5224
- 订单到仓动态业务时间更新业务修改 · 046fe455
  332784038@qq.com authored Aug 21, 2024
  
  046fe455
- Merge remote-tracking branch 'origin/dev' into dev · 67828138
  332784038@qq.com authored Aug 21, 2024
  
  67828138
- Merge branch 'master-fix' into dev · f5f85128
  332784038@qq.com authored Aug 21, 2024
  
  f5f85128
- 出货状态变更调用逻辑bug修复 · df53851f
  332784038@qq.com authored Aug 21, 2024
  
  df53851f
20 Aug, 2024 7 commits
- Merge branch 'refs/heads/feature_member_score' into dev · 02ac2898
  zhangfeng authored Aug 20, 2024
  
  02ac2898
- Merge branch 'refs/heads/feature_member_score_zhangfeng' into feature_member_score · b83a6f8f
  zhangfeng authored Aug 20, 2024
  
  b83a6f8f
- 客户端礼品详情修改 · 84558fd7
  zhangfeng authored Aug 20, 2024
  
  84558fd7
- Merge branch 'master-fix' into dev · 5e43114e
  332784038@qq.com authored Aug 20, 2024
  
  5e43114e
- web-app端订单详情中的屏蔽清关动态 · c1ec2431
  332784038@qq.com authored Aug 20, 2024
  
  c1ec2431
- Merge branch 'master-fix' into dev · 2fcb0796
  332784038@qq.com authored Aug 20, 2024
  
  2fcb0796
- 复制价格业务重构 · 910207c2
  332784038@qq.com authored Aug 20, 2024
  
  910207c2
19 Aug, 2024 14 commits
- Merge branch 'master-fix' into dev · 73fc4fec
  332784038@qq.com authored Aug 19, 2024
  
  73fc4fec
- 到仓审批通过时不对订单的到仓动态进行更新 · 58df3636
  332784038@qq.com authored Aug 19, 2024
  
  58df3636
- Merge branch 'refs/heads/feature_member_score' into dev · c406c74a
  zhangfeng authored Aug 19, 2024
  
  c406c74a
- Merge branch 'refs/heads/feature_member_score_zhangfeng' into feature_member_score · cbb09bc4
  zhangfeng authored Aug 19, 2024
  
  cbb09bc4
- 积分规则启用校验 · 954206ab
  zhangfeng authored Aug 19, 2024
  
  954206ab
- Merge branch 'refs/heads/feature_member_score' into dev · 01da602f
  zhangfeng authored Aug 19, 2024
  
  01da602f
- Merge branch 'refs/heads/feature_member_score_zhangfeng' into feature_member_score · 2fabfe1d
  zhangfeng authored Aug 19, 2024
  
  2fabfe1d
- Merge branch 'master-zhengyi' into dev · 637b4d91
  332784038@qq.com authored Aug 19, 2024
  
  637b4d91
- APP/WEB/官网，显示的订单动态中，空运和海运均屏蔽已清关动态（仅屏蔽，不做其他修改） · da3a871c
  332784038@qq.com authored Aug 19, 2024
  
  da3a871c
- Merge remote-tracking branch 'origin/master' · 43ed21e3
  332784038@qq.com authored Aug 19, 2024
  
  43ed21e3
- Merge remote-tracking branch 'origin/dev' into dev · 8442ecfc
  332784038@qq.com authored Aug 19, 2024
  
  8442ecfc
- Merge branch 'master-zhengyi' into dev · 1c9d0acd
  332784038@qq.com authored Aug 19, 2024
  
  1c9d0acd
- APP/WEB/官网，显示的订单动态中，空运和海运均屏蔽已清关动态（仅屏蔽，不做其他修改） · 4926e86c
  332784038@qq.com authored Aug 19, 2024
  
  4926e86c
- 礼品领取方式校验 · 77525aef
  zhangfeng authored Aug 19, 2024
  
  77525aef
16 Aug, 2024 10 commits
- 积分规则推荐触发修改 · 26afa7ad
  zhangfeng authored Aug 16, 2024
  
  26afa7ad
- Merge branch 'refs/heads/feature_member_score' into dev · 520e5d2a
  zhangfeng authored Aug 16, 2024
  
  520e5d2a
- Merge branch 'refs/heads/feature_member_score_zhangfeng' into feature_member_score · 5ff85533
  zhangfeng authored Aug 16, 2024
  
  5ff85533
- 兑换记录雪花算法id转字符串类型返回 · 0c90acee
  zhangfeng authored Aug 16, 2024
  
  0c90acee
- Merge branch 'master-fix' · 0cbf18bf
  zhengyi authored Aug 16, 2024
  
  0cbf18bf
- Merge branch 'master-fix' into dev · 6a3168f3
  zhengyi authored Aug 16, 2024
  
  6a3168f3
- 订单修改审批业务当订单控货状态变更时不在重置订单的业绩归属信息 · 678f231f
  zhengyi authored Aug 16, 2024
```
Signed-off-by: zhengyi <landuo321@aliyun.com>
```
  678f231f
- 订单修改审批业务当订单控货状态变更时不在重置订单的业绩归属信息 · 69e9e162
  zhengyi authored Aug 16, 2024
```
Signed-off-by: zhengyi <landuo321@aliyun.com>
```
  69e9e162
- Merge branch 'refs/heads/feature_member_score' into dev · 5ae8dd07
  zhangfeng authored Aug 16, 2024
  
  5ae8dd07
- Merge branch 'refs/heads/feature_member_score_zhangfeng' into feature_member_score · 5de05ec2
  zhangfeng authored Aug 16, 2024
  
  5de05ec2