Commits · 5b731dcff499766fae88f849bcc49820a83622c7 · 董敬伟 / liquidnet-bus-v1

18 Nov, 2021 8 commits
- Merge branch 'dev_merchant' into dev_merchant_tice · 5b731dcf
  Tice authored Nov 18, 2021
  
  5b731dcf
- 演出授权 · a160c9d1
  Tice authored Nov 18, 2021
  
  a160c9d1
- 同步订单完成 · 3bf495da
  胡佳晨 authored Nov 18, 2021
  
  3bf495da
- Merge remote-tracking branch 'origin/dev_merchant' into dev_merchant · 99d3e50c
  胡佳晨 authored Nov 18, 2021
  
  99d3e50c
- Merge branch 'dev_merchant_tice' into dev_merchant · 117bbd46
  Tice authored Nov 18, 2021
  
  117bbd46
- Merge branch 'dev_merchant_tice' of... · d64fc751
  Tice authored Nov 18, 2021
```
Merge branch 'dev_merchant_tice' of gitlab.zhengzai.tv:dongjingwei/liquidnet-bus-v1 into dev_merchant_tice
```
  d64fc751
- 优化授权细节 · 6123966d
  Tice authored Nov 18, 2021
  
  6123966d
- commit · 795d8490
  胡佳晨 authored Nov 18, 2021
  
  795d8490
17 Nov, 2021 6 commits
- 场地及主办详情展示及审核 · a21f9d0a
  liuyang authored Nov 17, 2021
  
  a21f9d0a
- 同步票务平台 · 579050bc
  胡佳晨 authored Nov 17, 2021
  
  579050bc
- update · 195dd9ad
  Tice authored Nov 17, 2021
  
  195dd9ad
- 申请添加 mongo · 23dedf23
  Tice authored Nov 17, 2021
  
  23dedf23
- Merge branch 'dev_merchant_tice' into dev_merchant · 6676ce6e
  Tice authored Nov 17, 2021
  
  6676ce6e
- 更新 · 11887ae1
  Tice authored Nov 17, 2021
  
  11887ae1
16 Nov, 2021 8 commits
- 封装 innerUtils · 8d53861f
  胡佳晨 authored Nov 16, 2021
  
  8d53861f
- update · ed2a96c0
  Tice authored Nov 16, 2021
  
  ed2a96c0
- statusSell 初始值复制注释 · f0334cfa
  胡佳晨 authored Nov 16, 2021
```
增加 场地审核状态
```
  f0334cfa
- update · ef6398de
  Tice authored Nov 16, 2021
  
  ef6398de
- fix · 691aafc9
  Tice authored Nov 16, 2021
  
  691aafc9
- Merge branch 'dev_merchant' into dev_merchant_tice · 8a94d903
  Tice authored Nov 16, 2021
  
  8a94d903
- 授权 · 6eed776a
  Tice authored Nov 16, 2021
  
  6eed776a
- 添加 status_sell · bb47f2cb
  胡佳晨 authored Nov 16, 2021
  
  bb47f2cb
15 Nov, 2021 18 commits
- 权限相关 · 4b23ea04
  胡佳晨 authored Nov 15, 2021
  
  4b23ea04
- 调用权限接口 · cb2c9a00
  胡佳晨 authored Nov 15, 2021
  
  cb2c9a00
- bug fix · d88c76f1
  Tice authored Nov 15, 2021
  
  d88c76f1
- update · ae0e6058
  Tice authored Nov 15, 2021
  
  ae0e6058
- db update · 3dd02200
  Tice authored Nov 15, 2021
  
  3dd02200
- Merge branch 'dev_merchant_tice' into dev_merchant · 2be1eb6c
  Tice authored Nov 15, 2021
  
  2be1eb6c
- 主办申请审核 · 29416af2
  Tice authored Nov 15, 2021
  
  29416af2
- 提交快递模板 · 34476570
  胡佳晨 authored Nov 15, 2021
  
  34476570
- 场地审核 · c3983863
  Tice authored Nov 15, 2021
  
  c3983863
- Merge branch 'dev_ticket_system' into dev_merchant · 71addbf5
  胡佳晨 authored Nov 15, 2021
```
# Conflicts:
#	liquidnet-bus-config/liquidnet-config/application-test.yml
#	liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/partner/KylinTicketTimesPartnerController.java
#	liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/partner/KylinTicketsPartnerController.java
```
  71addbf5
- 票种相关增加快递票寄付，到付 · 8e8524df
  胡佳晨 authored Nov 15, 2021
  
  8e8524df
- 修改 Vo提示 · 393c483b
  胡佳晨 authored Nov 15, 2021
  
  393c483b
- 暂时提交接口 · 735bd1e4
  胡佳晨 authored Nov 15, 2021
  
  735bd1e4
- Merge branch 'master' into dev_merchant · 8a5887b8
  胡佳晨 authored Nov 15, 2021
  
  8a5887b8
- Merge branch 'master_1' into 'master' · a069696e
  Administrator authored Nov 15, 2021
```
修改配置文件 不影响线上 39.107.71.112

See merge request !117
```
  a069696e
- 修改配置文件不影响线上 39.107.71.112 · 153d478a
  胡佳晨 authored Nov 15, 2021
  
  153d478a
- 最大积分限制添加 · 73691fa1
  胡佳晨 authored Nov 15, 2021
  
  73691fa1
- Merge branch 'dev_merchant' into dev_merchant_tice · 9482c9ac
  Tice authored Nov 15, 2021
  
  9482c9ac