Commits · 8fc9e02b4fd5e1b577601651dda9b8c4230e9368 · 董敬伟 / liquidnet-bus-v1

20 May, 2021 13 commits
- fix sql to mq; · 8fc9e02b
  张国柄 authored May 20, 2021
  
  8fc9e02b
- banner参数特殊值0的必填判断时间空的处理null · d5ddd54e
  jiangxiulong authored May 20, 2021
```
演出状态值 sort排序默认放在下面报错处理
```
  d5ddd54e
- fix:绑定多个同类型第三方账号； · 1df07d97
  张国柄 authored May 20, 2021
  
  1df07d97
- fix sso token; · f2c26e4b
  张国柄 authored May 20, 2021
  
  f2c26e4b
- 修改演出统计库存 · 20dc9510
  胡佳晨 authored May 20, 2021
  
  20dc9510
- 修改演出统计库存 · 9b3858c7
  胡佳晨 authored May 20, 2021
  
  9b3858c7
- Merge remote-tracking branch 'origin/dev' into dev · b512594f
  张国柄 authored May 20, 2021
  
  b512594f
- 注册用户添加qrcode; · a76b88ac
  张国柄 authored May 20, 2021
```
登录返回会员资料;
```
  a76b88ac
- 封装库存相关 · 92e6f59b
  胡佳晨 authored May 20, 2021
  
  92e6f59b
- 修复bug · e40f01cf
  胡佳晨 authored May 20, 2021
  
  e40f01cf
- Merge branch 'dev' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into dev · eda42862
  洪全海 authored May 20, 2021
  
  eda42862
- 会员支付回调接口定义 · 2a45e07a
  洪全海 authored May 20, 2021
  
  2a45e07a
- 会员购买状态 · 5c65491e
  jiangxiulong authored May 20, 2021
  
  5c65491e
19 May, 2021 21 commits
- Merge branch 'dev' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into dev · d4cbec6a
  洪全海 authored May 19, 2021
  
  d4cbec6a
- Merge branch 'dev' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into dev · c93d8ddb
  洪全海 authored May 19, 2021
```
# Conflicts:
#	liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamEntersServiceImpl.java
```
  c93d8ddb
- 修复bug · b30e657f
  胡佳晨 authored May 19, 2021
  
  b30e657f
- Merge remote-tracking branch 'origin/dev' into dev · cb281ddc
  张国柄 authored May 19, 2021
  
  cb281ddc
- 想去API补充； · 979a35e3
  张国柄 authored May 19, 2021
  
  979a35e3
- 计算距离新建unit；票种增加isAgent · bc9b7fc2
  jiangxiulong authored May 19, 2021
  
  bc9b7fc2
- Merge branch 'dev' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into dev · b77b468f
  洪全海 authored May 19, 2021
```
# Conflicts:
#	liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamEntersServiceImpl.java
```
  b77b468f
- Merge branch 'dev' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into dev · 51d9dcbf
  洪全海 authored May 19, 2021
  
  51d9dcbf
- 提交代码，会员下单接口 · db014985
  洪全海 authored May 19, 2021
  
  db014985
- 想去API补充实现； · 76527861
  张国柄 authored May 19, 2021
```
kylin pom引包调整；
```
  76527861
- Merge remote-tracking branch 'origin/dev' into dev · ee705038
  jiangxiulong authored May 19, 2021
  
  ee705038
- adam演出列表计算距离 · 6fabec83
  jiangxiulong authored May 19, 2021
  
  6fabec83
- 收藏API补充实现 · 9d276043
  张国柄 authored May 19, 2021
  
  9d276043
- 收藏API补充实现 · 4194836f
  张国柄 authored May 19, 2021
  
  4194836f
- 修改bug · e9baff5f
  胡佳晨 authored May 19, 2021
  
  e9baff5f
- adam演出列表 · 385f27e6
  jiangxiulong authored May 19, 2021
  
  385f27e6
- Merge remote-tracking branch 'origin/dev' into dev · e4e0ac27
  jiangxiulong authored May 19, 2021
  
  e4e0ac27
- adam演出列表 · 4a00c844
  jiangxiulong authored May 19, 2021
  
  4a00c844
- Merge remote-tracking branch 'origin/dev' into dev · e96d8f5e
  胡佳晨 authored May 19, 2021
  
  e96d8f5e
- 修改 swagger 文档顺序 · 1ee07afc
  胡佳晨 authored May 19, 2021
  
  1ee07afc
- +kylin-feign-api； · 122db777
  张国柄 authored May 19, 2021
  
  122db777
18 May, 2021 6 commits
- 提交接口 · 7bfbad15
  胡佳晨 authored May 18, 2021
  
  7bfbad15
- 修改复制接口 · d5276796
  胡佳晨 authored May 18, 2021
  
  d5276796
- 修改复制接口 · f5fe65b9
  胡佳晨 authored May 18, 2021
  
  f5fe65b9
- Merge remote-tracking branch 'origin/dev' into dev · 576c086d
  张国柄 authored May 18, 2021
  
  576c086d
- 编辑收货地址去除default设置； · f90556fd
  张国柄 authored May 18, 2021
  
  f90556fd
- Merge remote-tracking branch 'origin/dev' into dev · 22ae2301
  胡佳晨 authored May 18, 2021
  
  22ae2301