Commits · 20246d5c0fc15344cbb4ba8c412508e2d2d2f3d6 · lanbaoming / jiedao-api-boot-master

14 Aug, 2024 8 commits
- Merge branch 'refs/heads/feature_member_score' into dev · 20246d5c
  zhangfeng authored Aug 14, 2024
  
  20246d5c
- 兑换记录核销回退修改 · 0bc88d2f
  zhangfeng authored Aug 14, 2024
  
  0bc88d2f
- 客户端兑换记录添加图片，单次兑换礼品积分 · 80ed7bf4
  zhangfeng authored Aug 14, 2024
  
  80ed7bf4
- Merge branch 'refs/heads/feature_member_score' into dev · 322b279b
  zhangfeng authored Aug 14, 2024
  
  322b279b
- 客户端兑换记录id转字符串 · 5097f231
  zhangfeng authored Aug 14, 2024
  
  5097f231
- Merge branch 'refs/heads/feature_member_score' into dev · 9ccf9251
  zhangfeng authored Aug 14, 2024
  
  9ccf9251
- 积分规则定时任务 · 8b70a7be
  zhangfeng authored Aug 14, 2024
  
  8b70a7be
- 网点区域树状列表获取 · d0ab099d
  zhangfeng authored Aug 14, 2024
  
  d0ab099d
13 Aug, 2024 12 commits
- Merge branch 'refs/heads/feature_member_score' into dev · e7152b1b
  zhangfeng authored Aug 13, 2024
  
  e7152b1b
- 获得会员积分分页获得城市异常 · 2b93bf94
  zhangfeng authored Aug 13, 2024
  
  2b93bf94
- 客户端积分日志排序 · 9c784d18
  zhangfeng authored Aug 13, 2024
  
  9c784d18
- Merge branch 'refs/heads/feature_member_score' into dev · c2d706b2
  zhangfeng authored Aug 13, 2024
  
  c2d706b2
- 礼品查询条件修改 · aa27c766
  zhangfeng authored Aug 13, 2024
  
  aa27c766
- 积分规则触发 · 695a7a6a
  zhangfeng authored Aug 13, 2024
  
  695a7a6a
- 客户端积分日志 · d6505e50
  zhangfeng authored Aug 13, 2024
  
  d6505e50
- 海运已装单bug · d05dbe2c
  huyf authored Aug 13, 2024
  
  d05dbe2c
- Merge branch 'refs/heads/feature_member_score' into dev · ca0509cb
  zhangfeng authored Aug 13, 2024
  
  ca0509cb
- 客户端积分日志 · 3759d55c
  zhangfeng authored Aug 13, 2024
  
  3759d55c
- Merge branch 'master-fix' into dev · f6e14a01
  332784038@qq.com authored Aug 13, 2024
  
  f6e14a01
- 复制价格修改业务逻辑 · fc813808
  332784038@qq.com authored Aug 13, 2024
  
  fc813808
12 Aug, 2024 20 commits
- 海运已装单bug · d7d86440
  huyf authored Aug 12, 2024
  
  d7d86440
- 海运已装单bug · 4fa32e12
  huyf authored Aug 12, 2024
  
  4fa32e12
- Merge branch 'inquiry-zhengyi' into dev · a0a79940
  zhengyi authored Aug 12, 2024
```
# Conflicts:
#	yudao-server/src/main/resources/i18n/messages.properties
#	yudao-server/src/main/resources/i18n/messages_en.properties
#	yudao-server/src/main/resources/i18n/messages_zh.properties
```
  a0a79940
- Merge branch 'refs/heads/feature_member_score' into dev · 6285f65d
  zhangfeng authored Aug 12, 2024
  
  6285f65d
- 礼品管理更新 · 75e7e80c
  zhangfeng authored Aug 12, 2024
  
  75e7e80c
- Merge branch 'refs/heads/feature_member_score' into dev · da304e0c
  zhangfeng authored Aug 12, 2024
  
  da304e0c
- 礼品管理网点，积分字段修改 · 63663133
  zhangfeng authored Aug 12, 2024
  
  63663133
- Merge branch 'refs/heads/feature_member_score' into dev · 96ed69bd
  zhangfeng authored Aug 12, 2024
  
  96ed69bd
- 客户端会员积分基本信息 · 8aa7bcf4
  zhangfeng authored Aug 12, 2024
  
  8aa7bcf4
- 仓库树状列表获取优化 · 7ac47779
  zhangfeng authored Aug 12, 2024
  
  7ac47779
- Merge branch 'refs/heads/feature_member_score' into dev · 1a4865c1
  zhangfeng authored Aug 12, 2024
  
  1a4865c1
- 客户端会员积分基本信息 · 3d4559a6
  zhangfeng authored Aug 12, 2024
  
  3d4559a6
- 礼品创建修改 · 99e50784
  zhangfeng authored Aug 12, 2024
  
  99e50784
- Revert "礼品兑换网点修改" · bde97df0
  zhangfeng authored Aug 12, 2024
```
This reverts commit 96aa5243.
```
  bde97df0
- Revert "兑换记录兑换网点修改" · 7dfd6f26
  zhangfeng authored Aug 12, 2024
```
This reverts commit 1e7eb71a.
```
  7dfd6f26
- 兑换记录兑换网点修改 · 1e7eb71a
  zhangfeng authored Aug 12, 2024
  
  1e7eb71a
- Merge branch 'refs/heads/feature_member_score' into dev · 8783a621
  zhangfeng authored Aug 12, 2024
  
  8783a621
- 礼品兑换网点修改 · 96aa5243
  zhangfeng authored Aug 12, 2024
  
  96aa5243
- 客户端会员信息添加会员等级，国家城市 · c3cfff53
  zhangfeng authored Aug 12, 2024
  
  c3cfff53
- Merge branch 'refs/heads/feature_member_score' into dev · 03a7d578
  zhangfeng authored Aug 12, 2024
  
  03a7d578