Commits · d3bf6e7f05425fa5758dc9695b30e75ad9345de8 · 董敬伟 / liquidnet-bus-v1

01 Aug, 2022 1 commit

Merge branch 'master' into bak220720_merge · d3bf6e7f

胡佳晨 authored Aug 01, 2022

# Conflicts:
#	liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinOrderTicketsServiceImpl.java

d3bf6e7f

29 Jul, 2022 23 commits
- ~config:opt; · 79ec8948
  张国柄 authored Jul 29, 2022
  
  79ec8948
- Merge branch 'pre' into 'master' · 837d7329
  张禹 authored Jul 29, 2022
```
Pre

See merge request !284
```
  837d7329
- Merge branch 'master' into dev-micropay · d56c8e53
  zhengfuxin authored Jul 29, 2022
  
  d56c8e53
- Merge branch 'pre' into 'master' · 208328ca
  张禹 authored Jul 29, 2022
```
Pre

See merge request !282
```
  208328ca
- 修改 admin · 3ae53b3b
  胡佳晨 authored Jul 29, 2022
  
  3ae53b3b
- Merge remote-tracking branch 'origin/pre' into pre · de597c01
  胡佳晨 authored Jul 29, 2022
  
  de597c01
- 修改 admin · 8aa51f52
  胡佳晨 authored Jul 29, 2022
  
  8aa51f52
- 1 · 7b421ae7
  sangchunxi authored Jul 29, 2022
  
  7b421ae7
- 修改 admin · a94e0513
  胡佳晨 authored Jul 29, 2022
  
  a94e0513
- 修改超时异常处理 · b6daacfd
  zhengfuxin authored Jul 29, 2022
  
  b6daacfd
- 1 · 619061f3
  sangchunxi authored Jul 29, 2022
  
  619061f3
- 1 · 56bd292b
  sangchunxi authored Jul 29, 2022
  
  56bd292b
- 1 · 5145ae6c
  sangchunxi authored Jul 29, 2022
  
  5145ae6c
- ~opt:mongo.index; · 4e795b0f
  张国柄 authored Jul 29, 2022
  
  4e795b0f
- 1 · 8b5bea59
  sangchunxi authored Jul 29, 2022
  
  8b5bea59
- 加入日志 · 86e448d9
  zhengfuxin authored Jul 29, 2022
  
  86e448d9
- 修改正在下单判断 · 7f4e4195
  sangchunxi authored Jul 29, 2022
  
  7f4e4195
- Merge remote-tracking branch 'origin/Fix220713_station_down_refresh' into pre · 4f058d1a
  张国柄 authored Jul 29, 2022
  
  4f058d1a
- Merge remote-tracking branch 'origin/master' into Fix220713_station_down_refresh · 02c4aeaa
  张国柄 authored Jul 29, 2022
  
  02c4aeaa
- 修改正在下单判断 · eabda39f
  sangchunxi authored Jul 29, 2022
  
  eabda39f
- 增加组合售订单号入库 · 34505eea
  胡佳晨 authored Jul 29, 2022
  
  34505eea
- ~opt:mongo.index; · 116fbce2
  张国柄 authored Jul 29, 2022
  
  116fbce2
- ~opt:mongo+index; · c77f4dac
  张国柄 authored Jul 29, 2022
  
  c77f4dac
28 Jul, 2022 14 commits
- 活动默认下线 · 77476e09
  胡佳晨 authored Jul 28, 2022
  
  77476e09
- 正在下单设置 · 330832af
  sangchunxi authored Jul 28, 2022
  
  330832af
- 正在下单设置 · bbc7f1f9
  sangchunxi authored Jul 28, 2022
  
  bbc7f1f9
- 正在下单 · 3fb97718
  sangchunxi authored Jul 28, 2022
  
  3fb97718
- 修改离线券数据 · 6eab515c
  胡佳晨 authored Jul 28, 2022
  
  6eab515c
- 正在下单 · 8ba583bd
  sangchunxi authored Jul 28, 2022
  
  8ba583bd
- Merge branch 'master' into pre · ded15ca5
  胡佳晨 authored Jul 28, 2022
  
  ded15ca5
- Merge branch 'bug_order' into 'master' · 772fec1f
  张禹 authored Jul 28, 2022
```
Bug order

See merge request !281
```
  772fec1f
- //优先时间数量大于1 提示非法下单 · 3d8da619
  胡佳晨 authored Jul 28, 2022
  
  3d8da619
- //优先时间数量大于1 提示非法下单 · 8a54445a
  胡佳晨 authored Jul 28, 2022
  
  8a54445a
- 禁用商铺出货 · b5d16e21
  胡佳晨 authored Jul 28, 2022
  
  b5d16e21
- 禁用商铺出货 · 279c8641
  胡佳晨 authored Jul 28, 2022
  
  279c8641
- 禁用商铺出货 · 505b3888
  胡佳晨 authored Jul 28, 2022
  
  505b3888
- 添加核销时间 · d6c0c604
  胡佳晨 authored Jul 28, 2022
  
  d6c0c604
27 Jul, 2022 2 commits
- 修改志愿者图片 · 76035019
  胡佳晨 authored Jul 27, 2022
  
  76035019
- Merge remote-tracking branch 'origin/dev_xuper_check_errro_20220725' into bak220720_merge · 8528af95
  anjiabin authored Jul 27, 2022
  
  8528af95