Commits · 6a3168f3c1e382dae0a2c69d5cbdc221eeb28c7d · lanbaoming / jiedao-api-boot-master · GitLab

16 Aug, 2024 9 commits
- 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 20 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-customerService' into dev · 4dc5c0a9
  332784038@qq.com authored Aug 15, 2024
  
  4dc5c0a9
- 新建订单为草稿订单时，重新编辑订单后，订单归属业务经理值为空的bug修复 · 2bb309f0
  332784038@qq.com authored Aug 15, 2024
  
  2bb309f0
- Merge remote-tracking branch 'origin/master-fix' into dev · 3b0bba44
  332784038@qq.com authored Aug 15, 2024
  
  3b0bba44
- 订单到仓动态业务时间bug修复 · c31fe01c
  332784038@qq.com authored Aug 15, 2024
  
  c31fe01c
- 后台获取礼品列表增加会员id筛选 · 0ccd65ec
  zhangfeng authored Aug 15, 2024
  
  0ccd65ec
14 Aug, 2024 11 commits
- Merge branch 'refs/heads/feature_member_score_zhangfeng' into feature_member_score · da4a1023
  zhangfeng authored Aug 14, 2024
  
  da4a1023
- 客户端礼品详情优化 · 2d693130
  zhangfeng authored Aug 14, 2024
  
  2d693130
- Merge branch 'refs/heads/feature_member_score_zhangfeng' into feature_member_score · 38a08d01
  zhangfeng authored Aug 14, 2024
  
  38a08d01
- 兑换礼品核销校验 · 45ce2726
  zhangfeng authored Aug 14, 2024
  
  45ce2726
- Merge branch 'refs/heads/feature_member_score_zhangfeng' into feature_member_score · 2bfc582c
  zhangfeng authored Aug 14, 2024
  
  2bfc582c
- 客户端接口字典翻译 · c6ce937a
  zhangfeng authored Aug 14, 2024
  
  c6ce937a
- Merge branch 'refs/heads/dev' into feature_member_score · 69cfe5b4
  zhangfeng authored Aug 14, 2024
  
  69cfe5b4
- 兑换记录核销回退修改 · 369fbe44
  zhangfeng authored Aug 14, 2024
  
  369fbe44
- Revert "兑换记录核销回退修改" · 12ac6d29
  zhangfeng authored Aug 14, 2024
```
This reverts commit 0bc88d2f.
```
  12ac6d29
- Merge branch 'refs/heads/feature_member_score' into dev · 20246d5c
  zhangfeng authored Aug 14, 2024
  
  20246d5c
- 兑换记录核销回退修改 · 0bc88d2f
  zhangfeng authored Aug 14, 2024
  
  0bc88d2f