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

18 Mar, 2022 1 commit
- Merge branch 'pre' into 'master' · 7f2f34f1
  Administrator authored Mar 18, 2022
```
Pre

See merge request !192
```
  7f2f34f1
17 Mar, 2022 10 commits
- 修改用券逻辑 · c8cb55e9
  胡佳晨 authored Mar 17, 2022
```
无考虑是否关联会员
只要是在会员时间到正常用户之间即可用券购买
```
  c8cb55e9
- 修改 slime 会员提前bug · 685be4d5
  胡佳晨 authored Mar 17, 2022
```
修改 限购
```
  685be4d5
- 修改下单逻辑 · d9f38468
  胡佳晨 authored Mar 17, 2022
  
  d9f38468
- 修改判断从如果是会员或者用了券就可以走会员时间，改为如果是老会员或者会员券的情况下还得是会员购买逻辑才可以走会员时间 · 3548ceb7
  胡佳晨 authored Mar 17, 2022
  
  3548ceb7
- 修改判断从如果是会员或者用了券就可以走会员时间，改为如果是老会员或者会员券的情况下还得是会员购买逻辑才可以走会员时间 · 633754be
  胡佳晨 authored Mar 17, 2022
  
  633754be
- 测试修改 · 72c1aa15
  胡佳晨 authored Mar 17, 2022
  
  72c1aa15
- Merge branch 'master' into dev_performance_paytxt · 83dd7db9
  胡佳晨 authored Mar 17, 2022
  
  83dd7db9
- 限购修改 · 3c6a15ba
  胡佳晨 authored Mar 17, 2022
  
  3c6a15ba
- Merge branch 'pre' into 'master' · 70915414
  Administrator authored Mar 17, 2022
```
~dev注册eureka.host配置外网IP，个人本地分支本地测试修改的IP别瞎提交、别瞎提交、别瞎提交;

See merge request !191
```
  70915414
- ~dev注册eureka.host配置外网IP，个人本地分支本地测试修改的IP别瞎提交、别瞎提交、别瞎提交; · d2aeba8b
  张国柄 authored Mar 17, 2022
  
  d2aeba8b
16 Mar, 2022 4 commits
- 修改修改文案html · cac4828b
  胡佳晨 authored Mar 16, 2022
  
  cac4828b
- Merge remote-tracking branch 'origin/jxl_0315_refund' into dev_performance_paytxt · 9d706897
  胡佳晨 authored Mar 16, 2022
  
  9d706897
- Merge remote-tracking branch 'origin/jxl_0303_upload_appraisal' into dev_performance_paytxt · 17c04adc
  胡佳晨 authored Mar 16, 2022
  
  17c04adc
- Merge branch 'pre' into 'master' · c64090f1
  Administrator authored Mar 16, 2022
```
Pre

See merge request !190
```
  c64090f1
15 Mar, 2022 4 commits
- ~dev注册eureka.host配置，个人本地分支本地测试修改的IP别瞎提交、别瞎提交、别瞎提交; · a25cc407
  张国柄 authored Mar 15, 2022
  
  a25cc407
- Merge branch 'master' into dev_performance_paytxt · d1f58e82
  胡佳晨 authored Mar 15, 2022
  
  d1f58e82
- -1 to 1 ; · 84e929fc
  jiangxiulong authored Mar 15, 2022
  
  84e929fc
- ~ · 3c7598c1
  张国柄 authored Mar 15, 2022
  
  3c7598c1
14 Mar, 2022 21 commits
- 修改消费 · f31ea650
  胡佳晨 authored Mar 14, 2022
  
  f31ea650
- Merge branch 'pre' into 'master' · c4542306
  Administrator authored Mar 14, 2022
```
Pre

See merge request !189
```
  c4542306
- 修改消费 · 31685685
  胡佳晨 authored Mar 14, 2022
  
  31685685
- 修改消费 · 5e8876ab
  胡佳晨 authored Mar 14, 2022
  
  5e8876ab
- Merge branch 'master' into dev_performance_paytxt · b9ed0433
  胡佳晨 authored Mar 14, 2022
  
  b9ed0433
- 修改商城支付文案 · 27e95af6
  胡佳晨 authored Mar 14, 2022
  
  27e95af6
- Merge branch 'pre' into 'master' · 98db76cf
  Administrator authored Mar 14, 2022
```
Pre

See merge request !188
```
  98db76cf
- 修改 ar相关接口 · d7e4ed49
  胡佳晨 authored Mar 14, 2022
  
  d7e4ed49
- 修改 ar相关接口 · 9d46f972
  胡佳晨 authored Mar 14, 2022
  
  9d46f972
- 修改消费退券逻辑 · 93fcb4ea
  胡佳晨 authored Mar 14, 2022
  
  93fcb4ea
- 修改消费退券逻辑 · f7e5d843
  胡佳晨 authored Mar 14, 2022
  
  f7e5d843
- 修改消费退券逻辑 · 5422f5b1
  胡佳晨 authored Mar 14, 2022
  
  5422f5b1
- 修改下单 name字段 · c772dc09
  胡佳晨 authored Mar 14, 2022
  
  c772dc09
- 修改下单 name字段 · 98b5f886
  胡佳晨 authored Mar 14, 2022
  
  98b5f886
- Merge branch 'master' into dev_performance_paytxt · 0149f648
  胡佳晨 authored Mar 14, 2022
  
  0149f648
- Merge branch 'pre' into 'master' · 676161a4
  Administrator authored Mar 14, 2022
```
Pre

See merge request !187
```
  676161a4
- 修改下单 · c8bf5823
  胡佳晨 authored Mar 14, 2022
  
  c8bf5823
- 修改下单 · b16c5dc7
  胡佳晨 authored Mar 14, 2022
  
  b16c5dc7
- 修改下单 · 80721237
  胡佳晨 authored Mar 14, 2022
  
  80721237
- 提交修改支付文案相关配置 · 88265b65
  胡佳晨 authored Mar 14, 2022
  
  88265b65
- 订单列表查询活动名称 · 6cf81375
  胡佳晨 authored Mar 14, 2022
  
  6cf81375