Commits · 7c11049f0bb18bc72b9c29bdb06030c2c38136e0 · 董敬伟 / liquidnet-bus-v1

06 Aug, 2021 8 commits
- sweet · 7c11049f
  胡佳晨 authored Aug 06, 2021
  
  7c11049f
- sweet 添加入库 · 5cbd0530
  胡佳晨 authored Aug 06, 2021
  
  5cbd0530
- Merge branch 'master' into dev-sweet · 93efe53f
  胡佳晨 authored Aug 06, 2021
  
  93efe53f
- sweet 添加入库 · ef9679f1
  胡佳晨 authored Aug 06, 2021
  
  ef9679f1
- 删除Adam中的注释代码（mongo操作、php请求）; · ac712890
  张国柄 authored Aug 06, 2021
  
  ac712890
- sweet 添加表 sweet_user_relation · 4eb0e8eb
  胡佳晨 authored Aug 06, 2021
  
  4eb0e8eb
- +API:小程序登录; · f725eb84
  张国柄 authored Aug 06, 2021
```
appid配置调整;
```
  f725eb84
- +API:小程序登录; · d1ea9e57
  张国柄 authored Aug 06, 2021
```
appid配置调整;
```
  d1ea9e57
05 Aug, 2021 20 commits
- sweet 增加收藏数据接口 · a01bb2fc
  胡佳晨 authored Aug 05, 2021
  
  a01bb2fc
- 修改redis消费队列方式 · 38519d75
  anjiabin authored Aug 05, 2021
  
  38519d75
- Merge remote-tracking branch 'origin/test' · 04dd4852
  anjiabin authored Aug 05, 2021
```
# Conflicts:
#	liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-dragon/src/main/java/com/liquidnet/service/consumer/dragon/receiver/AbstractRedisReceiver.java
#	liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-dragon/src/main/java/com/liquidnet/service/consumer/dragon/receiver/RedisRefundReceiver.java
```
  04dd4852
- Merge remote-tracking branch 'origin/dev' into test · 34917a50
  anjiabin authored Aug 05, 2021
```
# Conflicts:
#	liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-dragon/src/main/java/com/liquidnet/service/consumer/dragon/receiver/AbstractRedisReceiver.java
#	liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-dragon/src/main/java/com/liquidnet/service/consumer/dragon/receiver/RedisRefundReceiver.java
```
  34917a50
- MQ消费调整; · fe4c3436
  张国柄 authored Aug 05, 2021
  
  fe4c3436
- Merge remote-tracking branch 'origin/dev' into dev · 7e68aba0
  张国柄 authored Aug 05, 2021
  
  7e68aba0
- MQ消费调整; · 8219a7d3
  张国柄 authored Aug 05, 2021
  
  8219a7d3
- 修改redis消费队列方式 · cb4990ef
  anjiabin authored Aug 05, 2021
  
  cb4990ef
- Merge remote-tracking branch 'origin/dev' into dev · 9ccbb68f
  jiangxiulong authored Aug 05, 2021
  
  9ccbb68f
- 修改redis消费队列方式 · 6398aa93
  anjiabin authored Aug 05, 2021
  
  6398aa93
- Merge remote-tracking branch 'origin/dev' into dev · 62100e15
  jiangxiulong authored Aug 05, 2021
  
  62100e15
- dragon - 退款返回错误内容 · 661ff465
  胡佳晨 authored Aug 05, 2021
  
  661ff465
- 修改redis消费队列方式 · 2fdbf9b6
  anjiabin authored Aug 05, 2021
  
  2fdbf9b6
- 修改redis消费队列方式 · a30ba6c6
  anjiabin authored Aug 05, 2021
  
  a30ba6c6
- 修改redis消费队列方式 · 00a41d21
  anjiabin authored Aug 05, 2021
  
  00a41d21
- Merge branch 'dev-sweet' into dev · 86d3c4bf
  胡佳晨 authored Aug 05, 2021
  
  86d3c4bf
- Merge remote-tracking branch 'origin/dev-sweet' into dev-sweet · ad13a765
  胡佳晨 authored Aug 05, 2021
  
  ad13a765
- sweet · cfe6ac66
  胡佳晨 authored Aug 05, 2021
  
  cfe6ac66
- Revert "+API:第三方账号登录v1;" · fdb00783
  张国柄 authored Aug 05, 2021
```
This reverts commit 175718e6
```
  fdb00783
- Revert "+API:第三方账号登录v1;" · a0f6b27e
  张国柄 authored Aug 05, 2021
```
This reverts commit 175718e6
```
  a0f6b27e
04 Aug, 2021 12 commits
- Merge branch 'dev-sweet' into dev · faa138ad
  胡佳晨 authored Aug 04, 2021
  
  faa138ad
- sweet 提交标签接口 · 475b6571
  胡佳晨 authored Aug 04, 2021
  
  475b6571
- Merge branch 'dev-sweet' into dev · f9a369e0
  胡佳晨 authored Aug 04, 2021
  
  f9a369e0
- sweet 提交标签接口 · 67b62c85
  胡佳晨 authored Aug 04, 2021
  
  67b62c85
- Merge branch 'dev-sweet' into dev · f15932e0
  胡佳晨 authored Aug 04, 2021
  
  f15932e0
- sweet 提交标签接口 · ab224afb
  胡佳晨 authored Aug 04, 2021
  
  ab224afb
- sweet 提交标签接口 · 83a1f10b
  胡佳晨 authored Aug 04, 2021
  
  83a1f10b
- wechat msg xxl · bcd9ee34
  jiangxiulong authored Aug 04, 2021
  
  bcd9ee34
- test · 315a1528
  jiangxiulong authored Aug 04, 2021
  
  315a1528
- test · 378306a3
  jiangxiulong authored Aug 04, 2021
  
  378306a3
- 针对草莓音乐节小程序登录跳过完善资料处理; · 63a0bae0
  张国柄 authored Aug 04, 2021
  
  63a0bae0
- test · aae0278a
  jiangxiulong authored Aug 04, 2021
  
  aae0278a