Commits · 602b0cd51d8ffaec34819823222854dc89aee477 · youjj / cloud-platform

15 Nov, 2019 39 commits
- Merge remote-tracking branch 'origin/dev' into dev · 602b0cd5
  周健威 authored Nov 15, 2019
  
  602b0cd5
- Merge branch 'holiday-price' into dev · 4e3b4cfa
  周健威 authored Nov 15, 2019
  
  4e3b4cfa
- 订单添加记录上级id · bb2fd415
  周健威 authored Nov 15, 2019
  
  bb2fd415
- Merge branch 'master-zjw' into holiday-price · d8c8ea66
  周健威 authored Nov 15, 2019
  
  d8c8ea66
- Merge remote-tracking branch 'origin/dev' into dev · dfca75c6
  hanfeng authored Nov 15, 2019
  
  dfca75c6
- Merge branch 'master-Member-bug-modify' into dev · 8067be02
  hanfeng authored Nov 15, 2019
  
  8067be02
- Merge remote-tracking branch 'origin/dev' into dev · d0de2145
  周健威 authored Nov 15, 2019
  
  d0de2145
- Merge branch 'holiday-price' into dev · cb14c891
  周健威 authored Nov 15, 2019
  
  cb14c891
- 修改bug · de58a06e
  周健威 authored Nov 15, 2019
  
  de58a06e
- 订单添加记录上级id · e227d691
  周健威 authored Nov 15, 2019
  
  e227d691
- 修改官网旅游路线 · 52d3cb05
  hanfeng authored Nov 15, 2019
  
  52d3cb05
- Merge branch 'master-Member-bug-modify' into dev · 078f1c53
  hanfeng authored Nov 15, 2019
  
  078f1c53
- 修改官网旅游路线 · af14af8d
  hanfeng authored Nov 15, 2019
  
  af14af8d
- Merge remote-tracking branch 'origin/dev' into dev · 375d2de5
  hanfeng authored Nov 15, 2019
  
  375d2de5
- Merge branch 'master-Member-bug-modify' into dev · c2f54609
  hanfeng authored Nov 15, 2019
  
  c2f54609
- 修改官网旅游路线 · a15af830
  hanfeng authored Nov 15, 2019
  
  a15af830
- Merge branch 'holiday-price' into dev · 7f5a996c
  hezhen authored Nov 15, 2019
  
  7f5a996c
- 123 · 306c218c
  hezhen authored Nov 15, 2019
  
  306c218c
- Merge branch 'holiday-price' into dev · f66fefea
  周健威 authored Nov 15, 2019
  
  f66fefea
- Merge branch 'holiday-price' of... · c089e8b7
  hezhen authored Nov 15, 2019
```
Merge branch 'holiday-price' of http://113.105.137.151:22280/youjj/cloud-platform into holiday-price
```
  c089e8b7
- 123 · 75a42779
  hezhen authored Nov 15, 2019
  
  75a42779
- Merge remote-tracking branch 'origin/dev' into dev · 7a7fadf7
  周健威 authored Nov 15, 2019
  
  7a7fadf7
- Merge branch 'holiday-price' into dev · 4d65dbf0
  周健威 authored Nov 15, 2019
  
  4d65dbf0
- 添加描述 · 5a3dc58d
  周健威 authored Nov 15, 2019
  
  5a3dc58d
- Merge remote-tracking branch 'origin/dev' into dev · 1738bc65
  hanfeng authored Nov 15, 2019
  
  1738bc65
- Merge branch 'master-Member-bug-modify' into dev · 91ab69bc
  hanfeng authored Nov 15, 2019
  
  91ab69bc
- 修改官网旅游路线 · 6dde545c
  hanfeng authored Nov 15, 2019
  
  6dde545c
- Merge remote-tracking branch 'origin/dev' into dev · 6a9fddc7
  周健威 authored Nov 15, 2019
  
  6a9fddc7
- Merge branch 'holiday-price' into dev · 899a711d
  周健威 authored Nov 15, 2019
  
  899a711d
- Merge branch 'holiday-price' of... · 82d31ad6
  hezhen authored Nov 15, 2019
```
Merge branch 'holiday-price' of http://113.105.137.151:22280/youjj/cloud-platform into holiday-price
```
  82d31ad6
- 123 · c0227ca1
  hezhen authored Nov 15, 2019
  
  c0227ca1
- Merge branch '2019-11-15-vehicle' into dev · 36cf4836
  libin authored Nov 15, 2019
  
  36cf4836
- 佣金记录排序 · 7bd29df6
  libin authored Nov 15, 2019
  
  7bd29df6
- Merge branch 'master-vehicle-bg' into dev · f0a56bad
  jiaorz authored Nov 15, 2019
  
  f0a56bad
- 出车bug · e68928f4
  jiaorz authored Nov 15, 2019
  
  e68928f4
- Merge branch '2019-11-15-vehicle' into dev · 51597cda
  libin authored Nov 15, 2019
  
  51597cda
- 行驶证副本添加 · e91bac17
  libin authored Nov 15, 2019
  
  e91bac17
- Merge remote-tracking branch 'origin/master' · 94cb9fda
  周健威 authored Nov 15, 2019
  
  94cb9fda
- 添加描述 · 7a6296d1
  周健威 authored Nov 15, 2019
  
  7a6296d1
14 Nov, 2019 1 commit

Merge branch 'master-bacground-im' · 0d146e7c

jiaorz authored Nov 14, 2019

# Conflicts:
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/PublicController.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BackStageOrderController.java
#	xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/BranchCompanyBiz.java

0d146e7c