Commits · 52adc2eba77167aed61778f5a0217fa2e922ef63 · 董敬伟 / liquidnet-bus-v1

18 May, 2022 7 commits
- Merge branch 'master' into hjc_goblin_list · 52adc2eb
  胡佳晨 authored May 18, 2022
  
  52adc2eb
- 修改消费日志 · 225c68a3
  胡佳晨 authored May 18, 2022
  
  225c68a3
- 修改分批购获取当前时间段和下一个时间段的bug · 41cf4fdd
  胡佳晨 authored May 18, 2022
  
  41cf4fdd
- 修改分批购获取当前时间段和下一个时间段的bug · 50dd4151
  胡佳晨 authored May 18, 2022
  
  50dd4151
- goblin/artwork/info 增加arUrlIos、arUrlAndroid · d26c4b18
  jiangxiulong authored May 18, 2022
  
  d26c4b18
- xls 消费改为2个 · 044770a5
  胡佳晨 authored May 18, 2022
  
  044770a5
- 修改优先购/分批购库存回滚逻辑 · 7c1c6494
  胡佳晨 authored May 18, 2022
```
从 上个时间段内返回时间段内 改为 如果当前时间段不存在 则返回 下个时间段内
```
  7c1c6494
17 May, 2022 14 commits
- 修改消费日志 · b634b1be
  胡佳晨 authored May 17, 2022
  
  b634b1be
- 修改消费日志 · 811ac87e
  胡佳晨 authored May 17, 2022
  
  811ac87e
- 修改下单 · 740900bd
  胡佳晨 authored May 17, 2022
  
  740900bd
- Merge branch 'pre' into 'master' · cc298d6e
  Administrator authored May 17, 2022
```
Pre

See merge request !236
```
  cc298d6e
- Merge remote-tracking branch 'origin/FIx220515_consumers' into pre · 366edda3
  zhanggb authored May 17, 2022
  
  366edda3
- Merge branch 'master' into hjc_goblin_list · bc3a3457
  胡佳晨 authored May 17, 2022
  
  bc3a3457
- ~consumer:kylin.order; · b15bdb8f
  zhanggb authored May 17, 2022
  
  b15bdb8f
- 藏品列表根据分批购开售时间排序 · 652dfa28
  jiangxiulong authored May 17, 2022
  
  652dfa28
- 修改 nft商品列表定时任务 · fc82f198
  胡佳晨 authored May 17, 2022
  
  fc82f198
- Merge remote-tracking branch 'origin/master' into FIx220515_consumers · 80b6d08e
  zhanggb authored May 17, 2022
  
  80b6d08e
- 修改 nft商品列表定时任务 · f48655a6
  胡佳晨 authored May 17, 2022
  
  f48655a6
- 修改 nft商品列表定时任务 · 9f259e05
  胡佳晨 authored May 17, 2022
  
  9f259e05
- Merge remote-tracking branch 'origin/hjc_goblin_list' into hjc_goblin_list · be8d54bd
  胡佳晨 authored May 17, 2022
  
  be8d54bd
- 修改代码分段购库存回滚逻辑 · d2942b53
  胡佳晨 authored May 17, 2022
  
  d2942b53
16 May, 2022 6 commits
- isListCanBuy · 31215735
  jiangxiulong authored May 16, 2022
  
  31215735
- Merge remote-tracking branch 'origin/hjc_goblin_list' into hjc_goblin_list · 88c6d28a
  jiangxiulong authored May 16, 2022
  
  88c6d28a
- 分批购权限判断 · 7893e34b
  jiangxiulong authored May 16, 2022
  
  7893e34b
- 修改代码分段购库存回滚逻辑 · 3555dae8
  胡佳晨 authored May 16, 2022
  
  3555dae8
- 修改代码回滚逻辑 · a3175cd8
  胡佳晨 authored May 16, 2022
  
  a3175cd8
- goblin 名单修改导致的优先名单类型错误 bug修复 · f0623d4d
  胡佳晨 authored May 16, 2022
  
  f0623d4d
15 May, 2022 12 commits
- 取消日志 · 126c74e1
  胡佳晨 authored May 15, 2022
  
  126c74e1
- 增加日志 · 0b36c156
  胡佳晨 authored May 15, 2022
  
  0b36c156
- Merge branch 'pre' into 'master' · 4f7f1541
  张禹 authored May 15, 2022
```
Pre

See merge request !235
```
  4f7f1541
- 修改bug admin timeStart不修改的bug · 4b0ab548
  胡佳晨 authored May 15, 2022
```
注释代码
```
  4b0ab548
- 修改bug admin timeStart不修改的bug · 05ff5ac4
  胡佳晨 authored May 15, 2022
  
  05ff5ac4
- Merge remote-tracking branch 'origin/master' · 012ab828
  胡佳晨 authored May 15, 2022
  
  012ab828
- ~consumer:+listener; · 23beae92
  zhanggb authored May 15, 2022
  
  23beae92
- ~consumer:+listener; · cfb6a42d
  zhanggb authored May 15, 2022
  
  cfb6a42d
- 修改主动删除回滚库存到原始sku上 · e8cdd4b3
  胡佳晨 authored May 15, 2022
  
  e8cdd4b3
- ~consumer:listener.count; · dc7b1baf
  zhanggb authored May 15, 2022
  
  dc7b1baf
- ~consumer:goblin、nft、slowly; · 769a017e
  zhanggb authored May 15, 2022
  
  769a017e
- +consumer:goblin、nft、slowly; · b47c6cd0
  zhanggb authored May 15, 2022
  
  b47c6cd0
13 May, 2022 1 commit
- Merge branch 'master_consumer_kylin' into 'master' · d2e6de9c
  张禹 authored May 13, 2022
```
-queue:暂时移除订单相关队列;

See merge request !234
```
  d2e6de9c