Commits · 549ef5120a145032fc25f87bad0bebc577583a37 · 董敬伟 / liquidnet-bus-v1

22 Nov, 2021 2 commits

增加快递相关列表 · 549ef512
胡佳晨 authored Nov 22, 2021

549ef512

Merge remote-tracking branch 'origin/jxl_1115_refund' into dev_merchant · 56982c11

胡佳晨 authored Nov 22, 2021

# Conflicts:
#	liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinPerformanceVo.java
#	liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinPerformanceStatus.java

56982c11

19 Nov, 2021 11 commits
- 修改演出列表示例 · 45ee5049
  胡佳晨 authored Nov 19, 2021
  
  45ee5049
- Merge branch 'dev_merchant_tice' into dev_merchant · 94961735
  Tice authored Nov 19, 2021
  
  94961735
- bug fix · f42ee372
  Tice authored Nov 19, 2021
  
  f42ee372
- 修改下单提示和增加回滚库存文案 · 10672b3d
  胡佳晨 authored Nov 19, 2021
  
  10672b3d
- update · 2b043f16
  Tice authored Nov 19, 2021
  
  2b043f16
- 实名认证 · 3699ef4e
  Tice authored Nov 19, 2021
  
  3699ef4e
- bug fix · 3fc69ef1
  Tice authored Nov 19, 2021
  
  3fc69ef1
- update · f1fef01b
  Tice authored Nov 19, 2021
  
  f1fef01b
- Merge branch 'dev_merchant_tice' into dev_merchant · a90b885e
  Tice authored Nov 19, 2021
  
  a90b885e
- 权限优化 · c56905ea
  Tice authored Nov 19, 2021
  
  c56905ea
- 修改第三方演出列表 · ef936c31
  胡佳晨 authored Nov 19, 2021
  
  ef936c31
18 Nov, 2021 10 commits
- 添加演出权限聚合Vo · 0aba6d42
  Tice authored Nov 18, 2021
  
  0aba6d42
- update · 92823cd2
  Tice authored Nov 18, 2021
  
  92823cd2
- 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 10 commits
- 封装 innerUtils · 8d53861f
  胡佳晨 authored Nov 16, 2021
  
  8d53861f
- update · ed2a96c0
  Tice authored Nov 16, 2021
  
  ed2a96c0
- isBackPaperTicket 快递票是否需要退回配置 · 5140346e
  jiangxiulong authored Nov 16, 2021
  
  5140346e
- 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
- 快递模版 admin 上下线 · 730f1b4b
  jiangxiulong authored Nov 16, 2021
  
  730f1b4b
15 Nov, 2021 1 commit
- 快递模版前端模版和接口不支持api · c1f03a35
  jiangxiulong authored Nov 15, 2021
  
  c1f03a35