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

31 Jul, 2024 19 commits
- 会员id生成锁修改 · d55dac4e
  zhaobiyan authored Jul 31, 2024
  
  d55dac4e
- 会员id生成锁修改 · 89c2443c
  zhaobiyan authored Jul 31, 2024
  
  89c2443c
- 会员id生成锁修改 · fffe49e0
  zhaobiyan authored Jul 31, 2024
  
  fffe49e0
- Merge branch 'refs/heads/feature_member_score_zhangfeng' into feature_member_score · 72e84726
  zhangfeng authored Jul 31, 2024
  
  72e84726
- 订单V值触发 · 173aa1ab
  zhangfeng authored Jul 31, 2024
  
  173aa1ab
- 兑换撤销接口 · 33a5ce84
  zhaobiyan authored Jul 31, 2024
  
  33a5ce84
- 兑换撤销接口 · e3e82a56
  zhaobiyan authored Jul 31, 2024
  
  e3e82a56
- Merge remote-tracking branch 'origin/feature_member_score' into feature_member_score · f4a82b56
  zhangfeng authored Jul 31, 2024
  
  f4a82b56
- 批量兑换校验修改 · 855d2135
  zhangfeng authored Jul 31, 2024
  
  855d2135
- 批量兑换增加日志 · 7dcd3cd9
  zhaobiyan authored Jul 31, 2024
  
  7dcd3cd9
- 批量兑换增加日志 · 879a2da6
  zhaobiyan authored Jul 31, 2024
  
  879a2da6
- 批量兑换增加日志 · 273c29c2
  zhaobiyan authored Jul 31, 2024
  
  273c29c2
- 批量兑换增加日志 · a6e1d8f7
  zhaobiyan authored Jul 31, 2024
  
  a6e1d8f7
- Merge branch 'refs/heads/feature_member_score' into feature_member_score_zhangfeng · 75f42651
  zhangfeng authored Jul 31, 2024
  
  75f42651
- 积分规则接口校验 · 9bb083b3
  zhangfeng authored Jul 31, 2024
  
  9bb083b3
- 兑换信息导入 · 32b80572
  zhaobiyan authored Jul 31, 2024
  
  32b80572
- 兑换信息导入 · d04fa0d3
  zhaobiyan authored Jul 31, 2024
  
  d04fa0d3
- 兑换信息导入 · d0780bc5
  zhaobiyan authored Jul 31, 2024
  
  d0780bc5
- 兑换信息导入 · 9f7867a7
  zhaobiyan authored Jul 31, 2024
  
  9f7867a7
30 Jul, 2024 15 commits
- 兑换信息导入 · 64378e69
  zhaobiyan authored Jul 30, 2024
  
  64378e69
- Merge branch 'refs/heads/feature_member_score_zhangfeng' into feature_member_score · 93fbd7fc
  zhangfeng authored Jul 30, 2024
  
  93fbd7fc
- 积分规则接口 · 45bceac6
  zhangfeng authored Jul 30, 2024
  
  45bceac6
- Merge branch 'refs/heads/feature_member_score_zhangfeng' into feature_member_score · ea4b13f6
  zhangfeng authored Jul 30, 2024
  
  ea4b13f6
- 新增获取渠道精简列表接口 · e91f511c
  zhangfeng authored Jul 30, 2024
  
  e91f511c
- 积分规则接口 · d0402944
  zhangfeng authored Jul 30, 2024
  
  d0402944
- 积分规则接口 · ace06b39
  zhangfeng authored Jul 30, 2024
  
  ace06b39
- 积分规则接口校验 · b7ea7a20
  zhangfeng authored Jul 30, 2024
  
  b7ea7a20
- 会员积分查询新增编码筛选 · 7f1f5617
  zhaobiyan authored Jul 30, 2024
  
  7f1f5617
- 会员积分查询新增编码筛选 · 98c2e74c
  zhaobiyan authored Jul 30, 2024
  
  98c2e74c
- 兑换记录导出接口 · 928f6ae4
  zhaobiyan authored Jul 30, 2024
  
  928f6ae4
- 积分规则接口校验 · ed0ae6b3
  zhangfeng authored Jul 30, 2024
  
  ed0ae6b3
- Merge remote-tracking branch 'origin/feature_member_score' into feature_member_score · 44476b08
  zhangfeng authored Jul 30, 2024
  
  44476b08
- Merge branch 'refs/heads/feature_member_score_zhangfeng' into feature_member_score · ce5c2e27
  zhangfeng authored Jul 30, 2024
  
  ce5c2e27
- 积分规则接口 · 0612f246
  zhangfeng authored Jul 29, 2024
  
  0612f246
29 Jul, 2024 6 commits
- 核销回退接口 · 4f031428
  zhaobiyan authored Jul 29, 2024
  
  4f031428
- 核销回退接口 · 75a26330
  zhaobiyan authored Jul 29, 2024
  
  75a26330
- 兑换记录批量核准接口 · a9a99391
  zhaobiyan authored Jul 29, 2024
  
  a9a99391
- 兑换记录批量核准接口 · 1bdde0be
  zhaobiyan authored Jul 29, 2024
  
  1bdde0be
- 礼品兑换 · 57807f35
  zhangfeng authored Jul 29, 2024
  
  57807f35
- Merge branch 'refs/heads/feature_member_score_zhangfeng' into feature_member_score · b48dc662
  zhangfeng authored Jul 29, 2024
```
# Conflicts:
#	yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/controller/admin/redeem/RedeemRewardController.java
```
  b48dc662