Commits · 7f4e419521efcd08a57e718a4f5068806a10ab20 · 董敬伟 / liquidnet-bus-v1

29 Jul, 2022 2 commits
- 修改正在下单判断 · 7f4e4195
  sangchunxi authored Jul 29, 2022
  
  7f4e4195
- 修改正在下单判断 · eabda39f
  sangchunxi authored Jul 29, 2022
  
  eabda39f
28 Jul, 2022 7 commits
- 正在下单设置 · 330832af
  sangchunxi authored Jul 28, 2022
  
  330832af
- 正在下单设置 · bbc7f1f9
  sangchunxi authored Jul 28, 2022
  
  bbc7f1f9
- 正在下单 · 3fb97718
  sangchunxi authored Jul 28, 2022
  
  3fb97718
- 正在下单 · 8ba583bd
  sangchunxi authored Jul 28, 2022
  
  8ba583bd
- 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
23 Jul, 2022 15 commits
- Merge branch 'pre' into 'master' · c4443c8d
  Administrator authored Jul 23, 2022
```
Pre

See merge request !280
```
  c4443c8d
- Merge branch 'fix_xuper_20220723-01' into pre · 143a8a49
  anjiabin authored Jul 23, 2022
  
  143a8a49
- 测试提交 · 454fb8cd
  anjiabin authored Jul 23, 2022
  
  454fb8cd
- ~api:我的藏品列表:至信链上链结果查询异常处理; · cf2d51a8
  张国柄 authored Jul 23, 2022
  
  cf2d51a8
- 修改百度链购买入库逻辑 · a9fedfa4
  anjiabin authored Jul 23, 2022
  
  a9fedfa4
- 修改同步券mongo · 20654118
  胡佳晨 authored Jul 23, 2022
  
  20654118
- Merge branch 'fix_xuper_20220723-01' into pre · 05176bca
  anjiabin authored Jul 23, 2022
  
  05176bca
- 修改百度链配置文件 · 5a5b290b
  anjiabin authored Jul 23, 2022
  
  5a5b290b
- Merge branch 'pre' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into pre · 92ca6089
  anjiabin authored Jul 23, 2022
  
  92ca6089
- 修改百度链购买入库逻辑 · 0573faeb
  anjiabin authored Jul 23, 2022
  
  0573faeb
- 修改百度链购买入库逻辑 · 2a33ba77
  anjiabin authored Jul 23, 2022
  
  2a33ba77
- 修改同步券mongo · 3cd7fec5
  胡佳晨 authored Jul 23, 2022
  
  3cd7fec5
- Merge branch 'fix_xuper_20220723' into 'master' · f38f88bc
  张禹 authored Jul 23, 2022
```
生产百度链设置

See merge request !279
```
  f38f88bc
- 生产百度链设置 · e55bdc9b
  anjiabin authored Jul 23, 2022
  
  e55bdc9b
- Merge branch 'pre' into 'master' · 7b0a3236
  张禹 authored Jul 23, 2022
```
修改 支付返回状态 已支付 并且 订单状态为待支付状态 才能走支付成功逻辑

See merge request !278
```
  7b0a3236
22 Jul, 2022 14 commits
- 修改支付返回状态已支付并且订单状态为待支付状态才能走支付成功逻辑 · 93f11727
  胡佳晨 authored Jul 22, 2022
  
  93f11727
- Merge branch 'pre' into 'master' · 860146ba
  张禹 authored Jul 22, 2022
```
修改 ar离线文件

See merge request !277
```
  860146ba
- 修改 ar离线文件 · 9b984a3d
  胡佳晨 authored Jul 22, 2022
  
  9b984a3d
- Merge branch 'pre' into 'master' · c2db0616
  张禹 authored Jul 22, 2022
```
修改 sql

See merge request !276
```
  c2db0616
- 修改 sql · 9d51e766
  胡佳晨 authored Jul 22, 2022
  
  9d51e766
- Merge branch 'pre' into 'master' · b35b401c
  张禹 authored Jul 22, 2022
```
Pre

See merge request !275
```
  b35b401c
- Merge remote-tracking branch 'origin/dev-0721douYinBug' into pre · fc4690a3
  胡佳晨 authored Jul 22, 2022
  
  fc4690a3
- Merge branch 'pre' into 'master' · 4d413b6a
  张禹 authored Jul 22, 2022
```
Pre

See merge request !274
```
  4d413b6a
- ~revert:config; · 2f4dc148
  张国柄 authored Jul 22, 2022
```
~revert:del;
```
  2f4dc148
- +valid:兑换券兑换有效期+小于等于0验证; · ca588073
  张国柄 authored Jul 22, 2022
  
  ca588073
- 偷摸改了大麦 · 0cf834ab
  胡佳晨 authored Jul 22, 2022
  
  0cf834ab
- Merge remote-tracking branch 'origin/dev_rc_xuper_op' into dev_rc_xuper_op · c57336fa
  胡佳晨 authored Jul 22, 2022
  
  c57336fa
- Merge branch 'hjc_road_coupon' into dev_rc_xuper_op · 64943a94
  胡佳晨 authored Jul 22, 2022
  
  64943a94
- 帮前端处理巡演去是否可用逻辑 · 3cc73c93
  胡佳晨 authored Jul 22, 2022
  
  3cc73c93
21 Jul, 2022 2 commits
- Merge remote-tracking branch 'origin/dev_nft_box_ab' into dev_rc_xuper_op · 4afb7d45
  张国柄 authored Jul 21, 2022
  
  4afb7d45
- ~api:藏品管理:数字藏品:添加/编辑盲盒+是否隐藏、是否购买：兼容前端处理; · bed618c9
  张国柄 authored Jul 21, 2022
  
  bed618c9