Commits · 8e0e04112cb05bf5423b8bc3c18396a49b64481b · 董敬伟 / liquidnet-bus-v1

02 Dec, 2021 7 commits
- Merge branch 'dev_merchant_tice' into dev_merchant · 8e0e0411
  Tice authored Dec 02, 2021
  
  8e0e0411
- 不允许重复添加 · 66894ef6
  Tice authored Dec 02, 2021
  
  66894ef6
- ~opt; · d62af27f
  张国柄 authored Dec 02, 2021
  
  d62af27f
- 提交merchant 驳回演出 · c0ef20bb
  胡佳晨 authored Dec 02, 2021
  
  c0ef20bb
- Merge remote-tracking branch 'origin/dev_merchant' into dev_merchant · e5fe2f52
  胡佳晨 authored Dec 02, 2021
  
  e5fe2f52
- 提交场地迁移，演出归属权迁移 · 51a89773
  胡佳晨 authored Dec 02, 2021
  
  51a89773
- ~收货地址扩展（针对旧版本、历史数据兼容处理：添加、查询）; · 2db92a23
  张国柄 authored Dec 02, 2021
  
  2db92a23
01 Dec, 2021 21 commits
- bug fix · f572b6be
  Tice authored Dec 01, 2021
  
  f572b6be
- update · 171e0c30
  Tice authored Dec 01, 2021
  
  171e0c30
- Merge branch 'dev_merchant_tice' into dev_merchant · e69706d0
  Tice authored Dec 01, 2021
  
  e69706d0
- 脱敏，错误修改 · 9e9a60e4
  Tice authored Dec 01, 2021
  
  9e9a60e4
- 复制演出接口 · 2b7d1d93
  胡佳晨 authored Dec 01, 2021
  
  2b7d1d93
- 快递下单 · 34c47409
  胡佳晨 authored Dec 01, 2021
  
  34c47409
- ~OPT:API返回非必要属性处理; · a2fc7394
  张国柄 authored Dec 01, 2021
  
  a2fc7394
- Merge remote-tracking branch 'origin/dev_merchant' into dev_merchant · c4ef1d20
  张国柄 authored Dec 01, 2021
  
  c4ef1d20
- ~OPT:API返回非必要属性处理; · dc50af87
  张国柄 authored Dec 01, 2021
  
  dc50af87
- Merge branch 'dev_merchant_tice' into dev_merchant · 0622e725
  Tice authored Dec 01, 2021
  
  0622e725
- 添加获取演出下全部权限 · 5fae907d
  Tice authored Dec 01, 2021
  
  5fae907d
- Merge remote-tracking branch 'origin/dev_merchant' into dev_merchant · 3d571f25
  胡佳晨 authored Dec 01, 2021
  
  3d571f25
- 快递下单 · 5c1e8655
  胡佳晨 authored Dec 01, 2021
  
  5c1e8655
- ~API:收货地址扩展（Param\Vo\Entity\Table）; · 8c40ff46
  张国柄 authored Dec 01, 2021
  
  8c40ff46
- ~API:收货地址扩展（Param\Vo\Entity\Table）; · 9da7f8c0
  张国柄 authored Dec 01, 2021
  
  9da7f8c0
- 快递下单 · 62ba604e
  胡佳晨 authored Dec 01, 2021
  
  62ba604e
- 修改撤回和修改第一步 · 85798d57
  胡佳晨 authored Dec 01, 2021
  
  85798d57
- 修改 merchant 电子票 · 0f5b1e3f
  胡佳晨 authored Dec 01, 2021
  
  0f5b1e3f
- admin 详情 · 922db2e0
  胡佳晨 authored Dec 01, 2021
  
  922db2e0
- merchant修改 · eac77ea3
  胡佳晨 authored Dec 01, 2021
  
  eac77ea3
- 修改下单接口 · 2a8d0c20
  胡佳晨 authored Dec 01, 2021
  
  2a8d0c20
30 Nov, 2021 10 commits
- 切换 redis 数据源 · 1f573f03
  Tice authored Nov 30, 2021
  
  1f573f03
- fix bug · 065d7e52
  Tice authored Nov 30, 2021
  
  065d7e52
- 修改配置文件 · 56e3aff2
  胡佳晨 authored Nov 30, 2021
  
  56e3aff2
- 修改 set方法改为init · 400e43fe
  胡佳晨 authored Nov 30, 2021
  
  400e43fe
- 修改 set方法改为init · d7f0d4e8
  胡佳晨 authored Nov 30, 2021
  
  d7f0d4e8
- Merge branch 'dev_merchant_tice' into dev_merchant · 3a43f2fe
  Tice authored Nov 30, 2021
  
  3a43f2fe
- update · 6c9a74e2
  Tice authored Nov 30, 2021
  
  6c9a74e2
- 提交提审演出的时候初始化vo · afc76bec
  胡佳晨 authored Nov 30, 2021
  
  afc76bec
- 修改场地审核演出相关 · b3164e8e
  胡佳晨 authored Nov 30, 2021
  
  b3164e8e
- 修改场地审核演出相关 · de716bb8
  胡佳晨 authored Nov 30, 2021
  
  de716bb8
29 Nov, 2021 2 commits
- 合并孙云天代码 · 6a7bb5cc
  胡佳晨 authored Nov 29, 2021
  
  6a7bb5cc
- Merge remote-tracking branch 'origin/dev_freight' into dev_merchant · 7991b96d
  胡佳晨 authored Nov 29, 2021
```
# Conflicts:
#	liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/KylinGetShunFengPriceController.java
```
  7991b96d