Commits · 3314b14c87a5ea7dfb786bc6af22aaf3ae00f446 · 董敬伟 / liquidnet-bus-v1

24 Jun, 2021 4 commits
- 提交test环境 · 3314b14c
  anjiabin authored Jun 24, 2021
  
  3314b14c
- 提交生产环境 · ecd6c0f5
  anjiabin authored Jun 24, 2021
  
  ecd6c0f5
- 提交生产环境 · c711923a
  anjiabin authored Jun 24, 2021
  
  c711923a
- dm; · ceed7df5
  张国柄 authored Jun 24, 2021
  
  ceed7df5
23 Jun, 2021 36 commits
- 订单列表详情增加日志 · 4777b9f6
  胡佳晨 authored Jun 23, 2021
  
  4777b9f6
- Merge remote-tracking branch 'origin/dev' into dev · 1fc61c4f
  胡佳晨 authored Jun 23, 2021
  
  1fc61c4f
- 订单列表详情增加日志 · 04707487
  胡佳晨 authored Jun 23, 2021
  
  04707487
- dm; · 4f74f7ca
  张国柄 authored Jun 23, 2021
  
  4f74f7ca
- 订单列表详情增加日志 · 5de82118
  胡佳晨 authored Jun 23, 2021
  
  5de82118
- 订单详情二维码 · 482a803d
  胡佳晨 authored Jun 23, 2021
  
  482a803d
- 增加日志 · df1a6aa9
  胡佳晨 authored Jun 23, 2021
  
  df1a6aa9
- 增加日志 · 7930a7c1
  胡佳晨 authored Jun 23, 2021
  
  7930a7c1
- 增加日志 · 6f1c771c
  胡佳晨 authored Jun 23, 2021
  
  6f1c771c
- dm; · 1ba51d62
  张国柄 authored Jun 23, 2021
  
  1ba51d62
- 增加日志 · ca01d2af
  胡佳晨 authored Jun 23, 2021
  
  ca01d2af
- 修改审核接口 · 4c4cdf08
  胡佳晨 authored Jun 23, 2021
  
  4c4cdf08
- 数据迁移修改(订单维度) · 87381af6
  胡佳晨 authored Jun 23, 2021
```
修改订单超时时间
```
  87381af6
- dm; · 566b736a
  张国柄 authored Jun 23, 2021
  
  566b736a
- 提交生产环境 · d983cbe2
  anjiabin authored Jun 23, 2021
  
  d983cbe2
- Merge remote-tracking branch 'origin/dev' into dev · 625ac3b0
  jiangxiulong authored Jun 23, 2021
  
  625ac3b0
- Merge remote-tracking branch 'origin/dev' into dev · 0b213a45
  jiangxiulong authored Jun 23, 2021
```
# Conflicts:
#	liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/application-dev.yml
#	liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/application-prod.yml
#	liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/application-test.yml
```
  0b213a45
- 快递恢复 · 45179f62
  jiangxiulong authored Jun 23, 2021
  
  45179f62
- 提交生产环境 · 1bd3992a
  anjiabin authored Jun 23, 2021
  
  1bd3992a
- 提交生产环境 · 3ace5ef3
  anjiabin authored Jun 23, 2021
  
  3ace5ef3
- 提交生产环境 · a105e05a
  anjiabin authored Jun 23, 2021
  
  a105e05a
- Merge branch 'dev' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into dev · f0d84cc7
  anjiabin authored Jun 23, 2021
  
  f0d84cc7
- 提交生产环境 · 9d9eb0d4
  anjiabin authored Jun 23, 2021
  
  9d9eb0d4
- 演出详情null e.printStackTrace(); 去掉 · 25381496
  jiangxiulong authored Jun 23, 2021
  
  25381496
- Merge remote-tracking branch 'origin/dev' into dev · 8cd4ea8e
  jiangxiulong authored Jun 23, 2021
```
# Conflicts:
#	liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinPerformancesServiceImpl.java
```
  8cd4ea8e
- 演出详情null e.printStackTrace(); 去掉 · 1959c58b
  jiangxiulong authored Jun 23, 2021
  
  1959c58b
- dm; · 5f5b421b
  张国柄 authored Jun 23, 2021
  
  5f5b421b
- 提交生产环境 · 2684c9b9
  anjiabin authored Jun 23, 2021
  
  2684c9b9
- 提交生产环境 · 664e6556
  anjiabin authored Jun 23, 2021
  
  664e6556
- dm; · 1ad61582
  张国柄 authored Jun 23, 2021
  
  1ad61582
- Merge remote-tracking branch 'origin/dev' into dev · cb588582
  张国柄 authored Jun 23, 2021
  
  cb588582
- dm; · 94b351f6
  张国柄 authored Jun 23, 2021
  
  94b351f6
- 订单详情添加 notice 公告 · 050115bb
  胡佳晨 authored Jun 23, 2021
  
  050115bb
- 订单详情添加 notice 公告 · 7d6a02ed
  胡佳晨 authored Jun 23, 2021
  
  7d6a02ed
- 提交测试环境配置 · 46ecdc7b
  anjiabin authored Jun 23, 2021
  
  46ecdc7b
- Merge branch 'dev' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into dev · b04a1dfe
  anjiabin authored Jun 23, 2021
  
  b04a1dfe