Commits · c0af91d9d65455f8b8b44f8b8f1e605ec6f4713d · youjj / cloud-platform

10 Aug, 2019 20 commits
- 添加押金记录客服电话，出行记录查询筛选 · c0af91d9
  jiaorz authored Aug 10, 2019
  
  c0af91d9
- Merge remote-tracking branch 'origin/dev' into dev · 7b7426cb
  jiaorz authored Aug 10, 2019
  
  7b7426cb
- 添加押金记录客服电话，出行记录查询筛选 · 5a65a16b
  jiaorz authored Aug 10, 2019
  
  5a65a16b
- 修改bug · 0383d6c0
  周健威 authored Aug 10, 2019
  
  0383d6c0
- Merge remote-tracking branch 'origin/dev' into dev · c166f5e5
  周健威 authored Aug 10, 2019
  
  c166f5e5
- 修改bug · 25832415
  周健威 authored Aug 10, 2019
  
  25832415
- Merge remote-tracking branch 'origin/dev' into dev · 6c32d352
  jiaorz authored Aug 10, 2019
  
  6c32d352
- 添加押金记录客服电话，出行记录查询筛选 · efd83784
  jiaorz authored Aug 10, 2019
  
  efd83784
- 修改bug · 6a970e93
  周健威 authored Aug 10, 2019
  
  6a970e93
- Merge remote-tracking branch 'origin/dev' into dev · f0d46c4a
  周健威 authored Aug 10, 2019
  
  f0d46c4a
- 修改bug · 3b430711
  周健威 authored Aug 10, 2019
  
  3b430711
- Merge branch 'dev' of http://10.5.52.3/youjj/cloud-platform into dev2 · 9686012d
  hanfeng authored Aug 10, 2019
  
  9686012d
- 修改统计 · 2cba52fa
  hanfeng authored Aug 10, 2019
  
  2cba52fa
- Merge remote-tracking branch 'origin/dev' into dev · 5d5e3063
  jiaorz authored Aug 10, 2019
  
  5d5e3063
- 添加押金记录客服电话，出行记录查询筛选 · 87a210e8
  jiaorz authored Aug 10, 2019
  
  87a210e8
- 修改bug · 0c74a132
  周健威 authored Aug 10, 2019
  
  0c74a132
- Merge remote-tracking branch 'origin/dev' into dev · 0286106e
  周健威 authored Aug 10, 2019
  
  0286106e
- Merge branch 'dev' into feature-zjw · 60eb5a62
  周健威 authored Aug 10, 2019
```
# Conflicts:
#	xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/feign/OrderFeign.java
```
  60eb5a62
- Merge branch 'dev' of http://10.5.52.3/youjj/cloud-platform into dev2 · 7b3d2ef2
  hanfeng authored Aug 10, 2019
  
  7b3d2ef2
- 修改统计 · f7128af3
  hanfeng authored Aug 10, 2019
  
  f7128af3
09 Aug, 2019 20 commits
- 添加model相关修改 · 4ed88dee
  周健威 authored Aug 09, 2019
  
  4ed88dee
- 添加model相关修改 · 043b816d
  周健威 authored Aug 09, 2019
  
  043b816d
- Merge remote-tracking branch 'origin/dev' into dev · 5b150b96
  周健威 authored Aug 09, 2019
  
  5b150b96
- 添加model相关修改 · 690fd145
  周健威 authored Aug 09, 2019
  
  690fd145
- 购房车 · b961e366
  libin authored Aug 09, 2019
  
  b961e366
- 购房车 · 7ab1dc79
  libin authored Aug 09, 2019
  
  7ab1dc79
- Merge remote-tracking branch 'origin/dev' into dev · 015d00f7
  libin authored Aug 09, 2019
  
  015d00f7
- 购房车 · d74582fd
  libin authored Aug 09, 2019
  
  d74582fd
- 修改bug · 16257299
  周健威 authored Aug 09, 2019
  
  16257299
- Merge remote-tracking branch 'origin/dev' into dev · 815a9333
  周健威 authored Aug 09, 2019
  
  815a9333
- 修改第二笔退款 · dfb40ff3
  周健威 authored Aug 09, 2019
  
  dfb40ff3
- Merge branch 'dev' of http://10.5.52.3/youjj/cloud-platform into dev2 · 107b79a5
  hanfeng authored Aug 09, 2019
  
  107b79a5
- 修改统计 · f4ad7dd6
  hanfeng authored Aug 09, 2019
  
  f4ad7dd6
- Merge remote-tracking branch 'origin/dev' into dev · db1bbf24
  libin authored Aug 09, 2019
  
  db1bbf24
- 优惠券 · 977e1034
  libin authored Aug 09, 2019
  
  977e1034
- Merge branch 'dev' of http://10.5.52.3/youjj/cloud-platform into base-modify · 5c239dbf
  hanfeng authored Aug 09, 2019
```
# Conflicts:
#	xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/feign/OrderFeign.java
```
  5c239dbf
- 修改统计 · 01a72da0
  hanfeng authored Aug 09, 2019
  
  01a72da0
- Merge remote-tracking branch 'origin/dev' into dev · 052dba16
  jiaorz authored Aug 09, 2019
  
  052dba16
- 添加押金记录客服电话，出行记录查询筛选 · 015ea9ab
  jiaorz authored Aug 09, 2019
  
  015ea9ab
- 123 · 524237cd
  hezhen authored Aug 09, 2019
  
  524237cd