Commits · 4a50e4f512e12d055ff431e299fbd4ef41c15ad9 · 董敬伟 / liquidnet-bus-v1

31 Aug, 2022 3 commits
- Merge branch 'master' into hjc_nft_details · 4a50e4f5
  胡佳晨 authored Aug 31, 2022
  
  4a50e4f5
- 修改分批购盲盒和明盒关联关系 · 685f72ab
  胡佳晨 authored Aug 31, 2022
  
  685f72ab
- 提交混合售列表和数字藏品列表是否可转赠字段 · cfd6d596
  胡佳晨 authored Aug 31, 2022
  
  cfd6d596
30 Aug, 2022 6 commits
- Merge branch 'pre' into 'master' · a836ae1a
  Administrator authored Aug 30, 2022
```
Pre

See merge request !304
```
  a836ae1a
- bug:代理总人数过滤 · 09bae4b3
  GaoHu authored Aug 30, 2022
  
  09bae4b3
- 修改弹框 · 366b33d8
  sangchunxi authored Aug 30, 2022
  
  366b33d8
- Merge branch 'gaohu_0826_smileExit' into pre · 1181c7a5
  GaoHu authored Aug 30, 2022
  
  1181c7a5
- nft 列表 nft详情组合购详情增加在什么链转赠时间单位[秒] · 77c2e6d7
  胡佳晨 authored Aug 30, 2022
  
  77c2e6d7
- Merge branch 'pre' into 'master' · bc74d488
  张禹 authored Aug 30, 2022
```
Pre

See merge request !303
```
  bc74d488
29 Aug, 2022 4 commits
- Merge branch 'hjc_pda_change' into pre · 2514659e
  胡佳晨 authored Aug 29, 2022
```
# Conflicts:
#	liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/utils/ObjectUtil.java
```
  2514659e
- Merge branch 'master' into gaohu_0826_smileExit · 6cfcfdd8
  GaoHu authored Aug 29, 2022
  
  6cfcfdd8
- 打款演出结束判定逻辑 · 4a4b4357
  GaoHu authored Aug 29, 2022
  
  4a4b4357
- bug:用户总营收计算错误问题，打款后数据读取修改 · f547a5dd
  GaoHu authored Aug 29, 2022
  
  f547a5dd
27 Aug, 2022 1 commit
- Merge branch 'pre' into 'master' · 2aa46f40
  张禹 authored Aug 27, 2022
```
Pre

See merge request !302
```
  2aa46f40
26 Aug, 2022 6 commits
- bug:总代打款 · 7ea3cf66
  GaoHu authored Aug 26, 2022
  
  7ea3cf66
- 导出总销售金额取值 · bd52d439
  GaoHu authored Aug 26, 2022
  
  bd52d439
- 打款演出状态判断 · f63074a6
  GaoHu authored Aug 26, 2022
  
  f63074a6
- 打款功能修改 · 3b6182a5
  GaoHu authored Aug 26, 2022
  
  3b6182a5
- 增加字段 routeType · 7e9644eb
  胡佳晨 authored Aug 26, 2022
  
  7e9644eb
- 百度链订单购买切换 · 0f02fdbe
  anjiabin authored Aug 26, 2022
  
  0f02fdbe
25 Aug, 2022 10 commits
- Merge branch 'master' into hjc_ajb_wf · c4b2d7c6
  胡佳晨 authored Aug 25, 2022
  
  c4b2d7c6
- Merge branch 'fix_feign_err_create_bean' into 'master' · a39000b7
  张禹 authored Aug 25, 2022
```
~feign:循环依赖;

See merge request !301
```
  a39000b7
- ~feign:循环依赖; · e7bc9bb2
  张国柄 authored Aug 25, 2022
  
  e7bc9bb2
- Merge branch 'fix_feign_err_create_bean' into 'master' · 8afb00e8
  张禹 authored Aug 25, 2022
```
~feign:循环依赖;

See merge request !300
```
  8afb00e8
- ~feign:循环依赖; · 390913d2
  张国柄 authored Aug 25, 2022
  
  390913d2
- Merge branch 'pre' into 'master' · 505c1cdb
  张禹 authored Aug 25, 2022
```
Pre

See merge request !299
```
  505c1cdb
- 百度链订单购买切换 · 76e17e3d
  anjiabin authored Aug 25, 2022
  
  76e17e3d
- 代理数据导出ex文件名（演出名+日期+代理数据） · 88d1c522
  GaoHu authored Aug 25, 2022
  
  88d1c522
- nft详情vo 添加第一个分批购的开始/结束时间 · 03a6701c
  胡佳晨 authored Aug 25, 2022
  
  03a6701c
- bug有快递费的佣金计算问题 · 59fcb098
  GaoHu authored Aug 25, 2022
  
  59fcb098
24 Aug, 2022 10 commits
- bug总代未卖票佣金计算 · f93f8e85
  GaoHu authored Aug 24, 2022
  
  f93f8e85
- bug总代查询异常，退款中数据丢失 · 80f82443
  GaoHu authored Aug 24, 2022
  
  80f82443
- exit · d119d8ad
  GaoHu authored Aug 24, 2022
  
  d119d8ad
- exit · 23133119
  GaoHu authored Aug 24, 2022
  
  23133119
- exit:修改列表读取顺序 · 417866d3
  GaoHu authored Aug 24, 2022
  
  417866d3
- Merge branch 'gaohu_0805_smileBUG' of... · b6dbd6c9
  xuchen authored Aug 24, 2022
```
Merge branch 'gaohu_0805_smileBUG' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into gaohu_0805_smileBUG
```
  b6dbd6c9
- 添加代理演出列表导出 · 7eea377e
  xuchen authored Aug 24, 2022
  
  7eea377e
- 打款失败情况和新增打款数据redis过期时间 · faf8cb93
  GaoHu authored Aug 24, 2022
  
  faf8cb93
- 用户打款兼容已打款 · 39213041
  GaoHu authored Aug 24, 2022
  
  39213041
- Merge remote-tracking branch 'origin/master' into ajb_dev_xuper_transfer · 42ff5565
  张国柄 authored Aug 24, 2022
  
  42ff5565