Commits · 01da602f6a314010beca23ec53a529850a18bafa · lanbaoming / jiedao-api-boot-master · GitLab

19 Aug, 2024 9 commits
- 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 14 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
- 兑换记录更新流程修改 · f1e1f168
  zhangfeng authored Aug 16, 2024
  
  f1e1f168
- Merge branch 'refs/heads/feature_member_score' into dev · 58d1a6e9
  zhangfeng authored Aug 16, 2024
  
  58d1a6e9
- Merge branch 'refs/heads/feature_member_score_zhangfeng' into feature_member_score · 86e0d0bb
  zhangfeng authored Aug 16, 2024
  
  86e0d0bb
- 订单V值规则计算积分修改 · e78b1b1b
  zhangfeng authored Aug 16, 2024
  
  e78b1b1b
15 Aug, 2024 17 commits
- Merge branch 'refs/heads/feature_member_score' into dev · 7bf4f1a9
  zhangfeng authored Aug 15, 2024
  
  7bf4f1a9
- Merge branch 'refs/heads/feature_member_score_zhangfeng' into feature_member_score · bde1f4bc
  zhangfeng authored Aug 15, 2024
  
  bde1f4bc
- 客户端礼品兑换列表添加图片 · 2c427a30
  zhangfeng authored Aug 15, 2024
  
  2c427a30
- Merge branch 'refs/heads/feature_member_score' into dev · f981e55e
  zhangfeng authored Aug 15, 2024
  
  f981e55e
- Merge branch 'refs/heads/feature_member_score_zhangfeng' into feature_member_score · e9f3e5a1
  zhangfeng authored Aug 15, 2024
  
  e9f3e5a1
- 订单V值触发测试接口 · 80a057c9
  zhangfeng authored Aug 15, 2024
  
  80a057c9
- Merge branch 'refs/heads/feature_member_score' into dev · 7156a0c3
  zhangfeng authored Aug 15, 2024
  
  7156a0c3
- Merge branch 'refs/heads/feature_member_score_zhangfeng' into feature_member_score · 47895842
  zhangfeng authored Aug 15, 2024
  
  47895842
- 订单V值触发测试接口 · 7acafb18
  zhangfeng authored Aug 15, 2024
  
  7acafb18
- 礼品兑换校验 · 5f6c0fdd
  zhangfeng authored Aug 15, 2024
  
  5f6c0fdd
- Merge branch 'refs/heads/feature_member_score' into dev · d0e31078
  zhangfeng authored Aug 15, 2024
  
  d0e31078
- Merge branch 'refs/heads/feature_member_score_zhangfeng' into feature_member_score · 81b95ff0
  zhangfeng authored Aug 15, 2024
  
  81b95ff0
- 订单V值触发测试接口 · 52365601
  zhangfeng authored Aug 15, 2024
  
  52365601
- 礼品兑换完善校验 · eef3c4ae
  zhangfeng authored Aug 15, 2024
  
  eef3c4ae
- 会员功能新增sql脚本整理 · bc3631f0
  zhangfeng authored Aug 15, 2024
  
  bc3631f0
- Merge branch 'master-fix' · 28c79d9e
  332784038@qq.com authored Aug 15, 2024
  
  28c79d9e
- Merge branch 'master-customerService' into dev · 4dc5c0a9
  332784038@qq.com authored Aug 15, 2024
  
  4dc5c0a9