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

21 Jul, 2022 2 commits
- Merge remote-tracking branch 'origin/dev_xuper' into dev_rc_xuper_op · b2d4bfed
  胡佳晨 authored Jul 21, 2022
  
  b2d4bfed
- Merge branch 'hjc_road_coupon' into dev_rc_xuper_op · ebe32ca8
  胡佳晨 authored Jul 21, 2022
  
  ebe32ca8
20 Jul, 2022 2 commits
- 修改 sweet mongo 分片问题 · db7afb54
  胡佳晨 authored Jul 20, 2022
```
修改 根据ar标签获取数据问题
```
  db7afb54
- 修改dev上传路径地址 · 8fd7f031
  anjiabin authored Jul 20, 2022
  
  8fd7f031
19 Jul, 2022 14 commits
- ~admin:优先券关联巡演完善; · b32de598
  张国柄 authored Jul 19, 2022
  
  b32de598
- +admin.html:巡演券关联配置; · 76bb80cb
  张国柄 authored Jul 19, 2022
  
  76bb80cb
- 修改正在下单出货接口 · b8632594
  胡佳晨 authored Jul 19, 2022
```
修改 pos机下单直接出货
修改 订单绑定接口
```
  b8632594
- 修改正在下单出货接口 · 735fb9bb
  胡佳晨 authored Jul 19, 2022
```
修改 pos机下单直接出货
修改 订单绑定接口
```
  735fb9bb
- 修改正在下单出货接口 · 9d7f701e
  胡佳晨 authored Jul 19, 2022
```
修改 pos机下单直接出货
修改 订单绑定接口
```
  9d7f701e
- 修改绑定订单 · 0c5cb30f
  胡佳晨 authored Jul 19, 2022
  
  0c5cb30f
- +admin.html:巡演券关联配置; · 00282e5b
  张国柄 authored Jul 19, 2022
  
  00282e5b
- +admin.html:巡演券关联配置; · aaf3d013
  张国柄 authored Jul 19, 2022
  
  aaf3d013
- 优先券关联巡演部分 · c89a74c0
  dongchun authored Jul 19, 2022
  
  c89a74c0
- ~admin.api:巡演券关联配置接口+实现; · 47aff269
  张国柄 authored Jul 19, 2022
  
  47aff269
- +admin.api:巡演券关联配置接口+实现; · 81620bed
  张国柄 authored Jul 19, 2022
  
  81620bed
- 完成优先券对于巡演的拦截 · 898ca840
  胡佳晨 authored Jul 19, 2022
  
  898ca840
- 完成优先券对于巡演的拦截 · f0980065
  胡佳晨 authored Jul 19, 2022
  
  f0980065
- 完成优先券对于巡演的拦截 · da9de73d
  胡佳晨 authored Jul 19, 2022
  
  da9de73d
18 Jul, 2022 5 commits
- 增加家口根据券id集合获取数据 · 43129153
  胡佳晨 authored Jul 18, 2022
  
  43129153
- +redis.key:巡演券 · e4ec18b9
  张国柄 authored Jul 18, 2022
  
  e4ec18b9
- 添加couponId · d6889320
  胡佳晨 authored Jul 18, 2022
  
  d6889320
- 使用券增加 id · 21174eb0
  胡佳晨 authored Jul 18, 2022
  
  21174eb0
- Merge remote-tracking branch 'origin/master' into dev_xuper · fa2d3042
  张国柄 authored Jul 18, 2022
  
  fa2d3042
15 Jul, 2022 17 commits
- Merge branch 'pre' into 'master' · c032b792
  张禹 authored Jul 15, 2022
```
Pre

See merge request !272
```
  c032b792
- Merge branch 'hjc_admin_galaxy' into dev_pre · bfea80d5
  胡佳晨 authored Jul 15, 2022
  
  bfea80d5
- 站位减库存 · 158bd263
  胡佳晨 authored Jul 15, 2022
  
  158bd263
- Merge branch 'hjc_admin_galaxy' into dev_pre · f3b80d19
  胡佳晨 authored Jul 15, 2022
  
  f3b80d19
- 站位减库存 · 9dc525b9
  胡佳晨 authored Jul 15, 2022
  
  9dc525b9
- admin 后台nft订单 nft_id=>trading_txhash · 74736f41
  jiangxiulong authored Jul 15, 2022
  
  74736f41
- Merge branch 'hjc_admin_galaxy' into dev_pre · 4db77df5
  胡佳晨 authored Jul 15, 2022
  
  4db77df5
- Merge branch 'dev-0712activity' into dev_pre · 9d3e0109
  胡佳晨 authored Jul 15, 2022
  
  9d3e0109
- 修改话术 · 184205ce
  zhengfuxin authored Jul 15, 2022
  
  184205ce
- 隐藏周焕给的 fcateId 隐藏 · 13110a54
  胡佳晨 authored Jul 15, 2022
  
  13110a54
- 隐藏周焕给的 fcateId 隐藏 · 91aad0f9
  胡佳晨 authored Jul 15, 2022
  
  91aad0f9
- 隐藏周焕给的 fcateId 隐藏 · 2801e274
  胡佳晨 authored Jul 15, 2022
  
  2801e274
- 修改话术 · 80dff555
  zhengfuxin authored Jul 15, 2022
  
  80dff555
- 修改百度链购买入库逻辑 · 42c670e1
  anjiabin authored Jul 15, 2022
  
  42c670e1
- 修改百度链购买入库逻辑 · f0f5e1f9
  anjiabin authored Jul 15, 2022
  
  f0f5e1f9
- Merge remote-tracking branch 'origin/master' into dev_xuper · d223438c
  张国柄 authored Jul 15, 2022
  
  d223438c
- Merge remote-tracking branch 'origin/dev_xuper' into dev_xuper · 25df5994
  张国柄 authored Jul 15, 2022
  
  25df5994