Commits · 5f7e92655c0e3260d8f4d08f5d163d34c0bcc06d · lanbaoming / jiedao-api-boot-master

26 Jul, 2024 18 commits
- Merge branch 'refs/heads/feature_member_score' into dev · 5f7e9265
  zhangfeng authored Jul 26, 2024
  
  5f7e9265
- Merge branch 'refs/heads/feature_member_score_zhangfeng' into feature_member_score · 530c2d76
  zhangfeng authored Jul 26, 2024
  
  530c2d76
- feature-reward:修改 · 575e4f6f
  zhangfeng authored Jul 26, 2024
  
  575e4f6f
- Merge branch 'refs/heads/feature_member_score' into dev · daee3c1e
  zhangfeng authored Jul 26, 2024
  
  daee3c1e
- Merge branch 'refs/heads/feature_member_score_zhangfeng' into feature_member_score · f916cc58
  zhangfeng authored Jul 26, 2024
  
  f916cc58
- feature-reward:修改 · d196d57c
  zhangfeng authored Jul 26, 2024
  
  d196d57c
- Merge branch 'refs/heads/feature_member_score' into dev · 98934eb2
  zhangfeng authored Jul 26, 2024
  
  98934eb2
- Merge branch 'refs/heads/feature_member_score_zhangfeng' into feature_member_score · 8c2c3f58
  zhangfeng authored Jul 26, 2024
  
  8c2c3f58
- feature-reward:兑换方式修改 · 1958735a
  zhangfeng authored Jul 26, 2024
  
  1958735a
- Merge remote-tracking branch 'origin/dev' into dev · b94a25e0
  332784038@qq.com authored Jul 26, 2024
  
  b94a25e0
- Merge branch 'master-fix' into dev · 0f8d1df6
  332784038@qq.com authored Jul 26, 2024
  
  0f8d1df6
- 业绩bug修复 · 7c227ec3
  332784038@qq.com authored Jul 26, 2024
  
  7c227ec3
- merge · 1e09e12b
  zhaobiyan authored Jul 26, 2024
  
  1e09e12b
- 会员积分分页增加字段 · 621eb138
  zhaobiyan authored Jul 26, 2024
  
  621eb138
- Merge branch 'refs/heads/feature_member_score_zhangfeng' into feature_member_score · 472101b2
  zhangfeng authored Jul 26, 2024
  
  472101b2
- feature-reward:批量兑换 · ab8f42f6
  zhangfeng authored Jul 26, 2024
  
  ab8f42f6
- 兑换礼品流程增加积分更新，兑换记录插入 · b7c806b3
  zhaobiyan authored Jul 26, 2024
  
  b7c806b3
- 兑换礼品流程增加积分更新，兑换记录插入 · f6a68ca2
  zhaobiyan authored Jul 26, 2024
  
  f6a68ca2
25 Jul, 2024 22 commits
- 兑换礼品流程增加积分更新，兑换记录插入 · 82c6c4ca
  zhaobiyan authored Jul 25, 2024
  
  82c6c4ca
- merge · b5756901
  zhaobiyan authored Jul 25, 2024
  
  b5756901
- 礼品兑换基础类 · 035f70f1
  zhaobiyan authored Jul 25, 2024
  
  035f70f1
- feature-reward:批量兑换 · 104b9bbe
  zhangfeng authored Jul 25, 2024
  
  104b9bbe
- feature-reward:调整兑换传参 · c9bc4a60
  zhangfeng authored Jul 25, 2024
  
  c9bc4a60
- 兑换礼品名称修改 · ce70d32c
  zhaobiyan authored Jul 25, 2024
  
  ce70d32c
- 会员信息新增字段持有积分 · 779c12c3
  zhaobiyan authored Jul 25, 2024
  
  779c12c3
- 会员信息新增字段持有积分 · 8f829cc1
  zhaobiyan authored Jul 25, 2024
  
  8f829cc1
- 会员操作积分接口 · 827dcc50
  zhaobiyan authored Jul 25, 2024
  
  827dcc50
- 会员操作积分接口 · c32fef46
  zhaobiyan authored Jul 25, 2024
  
  c32fef46
- 会员操作积分接口 · 00d72aad
  zhaobiyan authored Jul 25, 2024
  
  00d72aad
- Merge branch 'feature_member_score' into dev · a8c785a5
  zhaobiyan authored Jul 25, 2024
  
  a8c785a5
- 会员操作积分接口 · 9c6f9ba4
  zhaobiyan authored Jul 25, 2024
  
  9c6f9ba4
- feature-reward:调整目录 · d8c7de2c
  zhangfeng authored Jul 25, 2024
  
  d8c7de2c
- Merge branch 'refs/heads/feature_member_score' into dev · a341fef5
  zhangfeng authored Jul 25, 2024
  
  a341fef5
- Merge branch 'refs/heads/feature_member_score_zhangfeng' into feature_member_score · 00ba2d32
  zhangfeng authored Jul 25, 2024
```
# Conflicts:
#	yudao-server/src/main/resources/i18n/messages_en.properties
#	yudao-server/src/main/resources/i18n/messages_zh.properties
```
  00ba2d32
- feature-reward:调整更新接口 · edcc406b
  zhangfeng authored Jul 25, 2024
  
  edcc406b
- Merge branch 'feature_member_score_zby' into feature_member_score · 88d7e534
  zhaobiyan authored Jul 25, 2024
  
  88d7e534
- 会员操作积分接口 · 7b40bff1
  zhaobiyan authored Jul 25, 2024
  
  7b40bff1
- feature-reward:调整目录结构 · 39db271e
  zhangfeng authored Jul 25, 2024
  
  39db271e
- Merge branch 'bugfix-84' into 'dev' · 41244ed8
  zhangfeng authored Jul 25, 2024
```
【BUG-84】 BUG:供应商TIN NO.文本框异常修复

See merge request !12
```
  41244ed8
- Merge branch 'refs/heads/feature_member_score' into dev · 151cf9ee
  zhangfeng authored Jul 25, 2024
  
  151cf9ee