Commits · 3c4fc75c64c43780b90b93fb0444f3eb76ad7250 · lanbaoming / jiedao-api-boot-master · GitLab

03 Aug, 2024 4 commits
- Merge branch 'master-fix' into dev · 3c4fc75c
  zhengyi authored Aug 03, 2024
  
  3c4fc75c
- 订单入仓修改审批提交计算费用还是走的之前订单信息参数业务，如果有错误提示，那么捕获错误，允许提交审批 · ee49523c
  zhengyi authored Aug 03, 2024
```
Signed-off-by: zhengyi <landuo321@aliyun.com>
```
  ee49523c
- Merge branch 'master-fix' into dev · a57ca835
  zhengyi authored Aug 03, 2024
  
  a57ca835
- 跟进客服因为查询条件为空不执行，这里对没有对应客户经理的跟进客服，进行非空参数添加，以保证不能获取数据的查询条件执行 · a352b551
  zhengyi authored Aug 03, 2024
  
  a352b551
02 Aug, 2024 36 commits
- Merge branch 'feature_member_score' into dev · 7a984e80
  zhaobiyan authored Aug 02, 2024
  
  7a984e80
- Merge branch 'feature_member_score_zby' into feature_member_score · e7c3e928
  zhaobiyan authored Aug 02, 2024
  
  e7c3e928
- 唯一键传参 · 6afa9a19
  zhaobiyan authored Aug 02, 2024
  
  6afa9a19
- 兑换详情增加会员积分 · c86ea3fa
  zhaobiyan authored Aug 02, 2024
  
  c86ea3fa
- 兑换详情增加会员积分 · e3350382
  zhaobiyan authored Aug 02, 2024
  
  e3350382
- Merge remote-tracking branch 'origin/dev' into dev · 99c8cfb8
  zhaobiyan authored Aug 02, 2024
  
  99c8cfb8
- 兑换详情增加会员积分 · 826d84b6
  zhaobiyan authored Aug 02, 2024
  
  826d84b6
- Merge branch 'feature_member_score_zby' into feature_member_score · ec8e84d5
  zhaobiyan authored Aug 02, 2024
```
# Conflicts:
#	yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
#	yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/api/score/MemberUserScoreApiImpl.java
```
  ec8e84d5
- 兑换详情增加会员积分 · 3d427878
  zhaobiyan authored Aug 02, 2024
  
  3d427878
- 积分操作新增唯一键幂等处理 · 8d3d0413
  zhaobiyan authored Aug 02, 2024
  
  8d3d0413
- Merge branch 'master-fix' into dev · f53a57b1
  332784038@qq.com authored Aug 02, 2024
  
  f53a57b1
- 拆单删除原单可能的业绩日志 · 233d870a
  332784038@qq.com authored Aug 02, 2024
  
  233d870a
- 兑换列表排序修改 · c259ec47
  zhaobiyan authored Aug 02, 2024
  
  c259ec47
- Merge remote-tracking branch 'origin/dev' into dev · 28edface
  332784038@qq.com authored Aug 02, 2024
  
  28edface
- Merge branch 'master-fix' into dev · 77a01927
  332784038@qq.com authored Aug 02, 2024
  
  77a01927
- 订单修改审批变动业绩归属的业务bug修改 · b5583399
  332784038@qq.com authored Aug 02, 2024
  
  b5583399
- Merge branch 'feature_member_score' into dev · 9ee0dfba
  zhaobiyan authored Aug 02, 2024
  
  9ee0dfba
- Merge branch 'feature_member_score_zby' into feature_member_score · 87815697
  zhaobiyan authored Aug 02, 2024
  
  87815697
- 雪花算法id 字符串类型返回 · 2d00ef3b
  zhaobiyan authored Aug 02, 2024
  
  2d00ef3b
- Merge branch 'feature_member_score' into dev · e52ba1b6
  zhaobiyan authored Aug 02, 2024
  
  e52ba1b6
- Merge branch 'feature_member_score_zby' into feature_member_score · 6f05ba2c
  zhaobiyan authored Aug 02, 2024
  
  6f05ba2c
- 雪花算法id 字符串类型返回 · 6d752e16
  zhaobiyan authored Aug 02, 2024
  
  6d752e16
- 雪花算法id 字符串类型返回 · ff4b2713
  zhaobiyan authored Aug 02, 2024
  
  ff4b2713
- 手动重置订单业绩归属的业务完善 · 4d740683
  332784038@qq.com authored Aug 02, 2024
  
  4d740683
- Merge branch 'feature_member_score' into dev · 8662d20e
  zhaobiyan authored Aug 02, 2024
  
  8662d20e
- Merge branch 'feature_member_score_zby' into feature_member_score · 87f219e9
  zhaobiyan authored Aug 02, 2024
  
  87f219e9
- 撤销参数修改 · 953d970a
  zhaobiyan authored Aug 02, 2024
  
  953d970a
- Merge branch 'feature_member_score' into dev · d5638121
  zhaobiyan authored Aug 02, 2024
  
  d5638121
- Merge remote-tracking branch 'origin/feature_member_score' into feature_member_score · fb550f73
  zhaobiyan authored Aug 02, 2024
  
  fb550f73
- Merge branch 'feature_member_score_zby' into feature_member_score · 9fd2a13e
  zhaobiyan authored Aug 02, 2024
  
  9fd2a13e
- 撤销参数修改 · 1e64c640
  zhaobiyan authored Aug 02, 2024
  
  1e64c640
- Merge branch 'refs/heads/feature_member_score_zhangfeng' into feature_member_score · bc04f90c
  zhangfeng authored Aug 02, 2024
  
  bc04f90c
- 订单V值删除单次获取最高积分逻辑 · ccac072e
  zhangfeng authored Aug 02, 2024
  
  ccac072e
- 订单V值触发使用mq · b2238b69
  zhangfeng authored Aug 02, 2024
  
  b2238b69
- 会员详情新增积分相关字段 · 2c9157f1
  zhaobiyan authored Aug 02, 2024
  
  2c9157f1
- Merge remote-tracking branch 'origin/dev' into dev · c7e283e5
  zhaobiyan authored Aug 02, 2024
  
  c7e283e5