Commits · 69f0be4591c83e2e7027cfd9396fa6d94b564b0d · youjj / cloud-platform

18 Nov, 2019 4 commits
- Merge branch 'holiday-price' into dev · 69f0be45
  libin authored Nov 18, 2019
  
  69f0be45
- Merge remote-tracking branch 'origin/holiday-price' into holiday-price · 5bd0611e
  libin authored Nov 18, 2019
  
  5bd0611e
- 车型价格设置 · a88986bc
  libin authored Nov 18, 2019
  
  a88986bc
- Merge branch 'master-bg-update' into dev · a8d0789a
  jiaorz authored Nov 18, 2019
```
# Conflicts:
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BackStageOrderController.java
```
  a8d0789a
17 Nov, 2019 2 commits
- 后台订单接口优化 · d15085f2
  jiaorz authored Nov 17, 2019
  
  d15085f2
- 后台订单接口优化 · b03206e9
  jiaorz authored Nov 17, 2019
  
  b03206e9
15 Nov, 2019 34 commits
- Merge branch 'holiday-price' into dev · b0bc6ea5
  hezhen authored Nov 15, 2019
  
  b0bc6ea5
- 123 · e5725aca
  hezhen authored Nov 15, 2019
  
  e5725aca
- 后台订单接口优化 · 80f309a8
  jiaorz authored Nov 15, 2019
  
  80f309a8
- Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev · f4c16911
  hezhen authored Nov 15, 2019
  
  f4c16911
- Merge branch 'holiday-price' into dev · 4b3f817c
  hezhen authored Nov 15, 2019
  
  4b3f817c
- Merge branch 'holiday-price' of... · 0cb50c73
  hezhen authored Nov 15, 2019
```
Merge branch 'holiday-price' of http://113.105.137.151:22280/youjj/cloud-platform into holiday-price
```
  0cb50c73
- 123 · 10a2db6e
  hezhen authored Nov 15, 2019
  
  10a2db6e
- 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
- 后台订单接口优化 · 5cfada0d
  jiaorz authored Nov 15, 2019
  
  5cfada0d
- 后台订单接口优化 · 55ce9119
  jiaorz authored Nov 15, 2019
  
  55ce9119
- 后台订单接口优化 · 3de2eaf0
  jiaorz authored Nov 15, 2019
  
  3de2eaf0
- 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
- 后台订单接口优化 · 097f4c98
  jiaorz authored Nov 15, 2019
  
  097f4c98
- 后台订单接口优化 · 03118e40
  jiaorz authored Nov 15, 2019
  
  03118e40
- 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
- 后台订单接口优化 · 984f9d3a
  jiaorz authored Nov 15, 2019
  
  984f9d3a