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

20 Jul, 2022 12 commits
- AR获取数据接口 · b469e3fc
  胡佳晨 authored Jul 20, 2022
```
只保留 参加该活动或者没参加活动的数据
```
  b469e3fc
- ~标签AR与非AR去重逻辑调整; · fafacda9
  张国柄 authored Jul 20, 2022
```
~config.opt;
```
  fafacda9
- ~config; · a84f6985
  张国柄 authored Jul 20, 2022
  
  a84f6985
- Merge remote-tracking branch 'origin/consumer_unite' into dev_bd_rm_consumer_od · d122bdb7
  张国柄 authored Jul 20, 2022
  
  d122bdb7
- ~config; · 3cd93560
  张国柄 authored Jul 20, 2022
  
  3cd93560
- ~config; · 0475657c
  张国柄 authored Jul 20, 2022
  
  0475657c
- Merge remote-tracking branch 'origin/dev_xuper' into dev_bd_rm_consumer_od · 00abd183
  anjiabin authored Jul 20, 2022
  
  00abd183
- 修改dev上传路径地址 · 8fd7f031
  anjiabin authored Jul 20, 2022
  
  8fd7f031
- Merge remote-tracking branch 'origin/consumer_unite' into dev_bd_rm_consumer_od · 89a3c6cd
  张国柄 authored Jul 20, 2022
  
  89a3c6cd
- ~config; · 6679463a
  张国柄 authored Jul 20, 2022
  
  6679463a
- Merge remote-tracking branch 'origin/consumer_unite' into dev_bd_rm_consumer_od · 713fff66
  张国柄 authored Jul 20, 2022
  
  713fff66
- ~config; · 2a8563fb
  张国柄 authored Jul 20, 2022
  
  2a8563fb
19 Jul, 2022 28 commits
- Merge remote-tracking branch 'origin/hjc_road_coupon' into dev_bd_rm_consumer_od · 9666c865
  张国柄 authored Jul 19, 2022
  
  9666c865
- ~admin:优先券关联巡演完善; · b32de598
  张国柄 authored Jul 19, 2022
  
  b32de598
- Merge remote-tracking branch 'origin/hjc_bug_zhengzai_pay' into dev_bd_rm_consumer_od · d5727805
  张国柄 authored Jul 19, 2022
  
  d5727805
- +admin.html:巡演券关联配置; · 76bb80cb
  张国柄 authored Jul 19, 2022
  
  76bb80cb
- Merge branch 'hjc_bug_zhengzai_pay' into dev_bd_rm_consumer_od · 09b704dd
  胡佳晨 authored Jul 19, 2022
  
  09b704dd
- 修改正在下单出货接口 · b8632594
  胡佳晨 authored Jul 19, 2022
```
修改 pos机下单直接出货
修改 订单绑定接口
```
  b8632594
- Merge branch 'hjc_bug_zhengzai_pay' into dev_bd_rm_consumer_od · 1e1a1611
  胡佳晨 authored Jul 19, 2022
  
  1e1a1611
- 修改正在下单出货接口 · 735fb9bb
  胡佳晨 authored Jul 19, 2022
```
修改 pos机下单直接出货
修改 订单绑定接口
```
  735fb9bb
- Merge branch 'hjc_bug_zhengzai_pay' into dev_bd_rm_consumer_od · 0bcc9dca
  胡佳晨 authored Jul 19, 2022
  
  0bcc9dca
- 修改正在下单出货接口 · 9d7f701e
  胡佳晨 authored Jul 19, 2022
```
修改 pos机下单直接出货
修改 订单绑定接口
```
  9d7f701e
- 修改绑定订单 · 0c5cb30f
  胡佳晨 authored Jul 19, 2022
  
  0c5cb30f
- Merge remote-tracking branch 'origin/hjc_road_coupon' into dev_bd_rm_consumer_od · 8c901d80
  张国柄 authored Jul 19, 2022
  
  8c901d80
- +admin.html:巡演券关联配置; · 00282e5b
  张国柄 authored Jul 19, 2022
  
  00282e5b
- Merge remote-tracking branch 'origin/hjc_road_coupon' into dev_bd_rm_consumer_od · 5fb3e80e
  张国柄 authored Jul 19, 2022
  
  5fb3e80e
- +admin.html:巡演券关联配置; · aaf3d013
  张国柄 authored Jul 19, 2022
  
  aaf3d013
- Merge remote-tracking branch 'origin/hjc_road_coupon' into dev_bd_rm_consumer_od · f3a55fd0
  张国柄 authored Jul 19, 2022
  
  f3a55fd0
- 优先券关联巡演部分 · c89a74c0
  dongchun authored Jul 19, 2022
  
  c89a74c0
- Merge branch 'dev-dragon&order' into dev_bd_rm_consumer_od · b67ebca6
  胡佳晨 authored Jul 19, 2022
  
  b67ebca6
- 修改下单 · 0520e5bd
  胡佳晨 authored Jul 19, 2022
  
  0520e5bd
- Merge remote-tracking branch 'origin/hjc_road_coupon' into dev_bd_rm_consumer_od · 01ed9f78
  张国柄 authored Jul 19, 2022
  
  01ed9f78
- ~admin.api:巡演券关联配置接口+实现; · 47aff269
  张国柄 authored Jul 19, 2022
  
  47aff269
- Merge remote-tracking branch 'origin/hjc_road_coupon' into dev_bd_rm_consumer_od · 244efa87
  张国柄 authored Jul 19, 2022
  
  244efa87
- +admin.api:巡演券关联配置接口+实现; · 81620bed
  张国柄 authored Jul 19, 2022
  
  81620bed
- 完成优先券对于巡演的拦截 · 898ca840
  胡佳晨 authored Jul 19, 2022
  
  898ca840
- bug:返回类型修改 · 505a387b
  GaoHu authored Jul 19, 2022
  
  505a387b
- Merge branch 'dev_notice_0708' into dev_bd_rm_consumer_od · 433fdcc9
  GaoHu authored Jul 19, 2022
  
  433fdcc9
- bug:时间区间修改 · 50bcddfb
  GaoHu authored Jul 19, 2022
  
  50bcddfb
- bug：组合购不显示 · a4bde0d5
  GaoHu authored Jul 19, 2022
  
  a4bde0d5