Commits · e4f6fbcd6b293384e1917a570e708bfb92b7a70c · youjj / cloud-platform

08 Nov, 2019 8 commits
- Merge branch 'master-modify-background-bug-hf' into base-modify · e4f6fbcd
  hanfeng authored Nov 08, 2019
  
  e4f6fbcd
- 修改订单统计 · a9ec708c
  hanfeng authored Nov 08, 2019
  
  a9ec708c
- Merge branch 'master-modify-background-bug-hf' into base-modify · d197a7c2
  hanfeng authored Nov 08, 2019
  
  d197a7c2
- 修改订单统计 · 21903d33
  hanfeng authored Nov 08, 2019
  
  21903d33
- Merge branch 'master-modify-background-bug-hf' into base-modify · 3102ab68
  hanfeng authored Nov 08, 2019
  
  3102ab68
- 修改订单统计 · a41125e8
  hanfeng authored Nov 08, 2019
  
  a41125e8
- Merge branch 'master-modify-background-bug-hf' into base-modify · 4957160d
  hanfeng authored Nov 08, 2019
  
  4957160d
- 修改订单统计 · b157e48f
  hanfeng authored Nov 08, 2019
  
  b157e48f
07 Nov, 2019 6 commits
- Merge remote-tracking branch 'origin/base-modify' into base-modify · 5240f118
  hanfeng authored Nov 07, 2019
  
  5240f118
- Merge branch 'master-modify-background-bug-hf' into base-modify · 360ac610
  hanfeng authored Nov 07, 2019
```
# Conflicts:
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java
```
  360ac610
- 修改订单统计 · e522a6f4
  hanfeng authored Nov 07, 2019
  
  e522a6f4
- 修改订单统计 · 43313abf
  hanfeng authored Nov 07, 2019
  
  43313abf
- Merge branch 'master-bacground-im' into base-modify · 601df947
  jiaorz authored Nov 07, 2019
  
  601df947
- 后台添加IM接口 · 35e4382b
  jiaorz authored Nov 07, 2019
  
  35e4382b
06 Nov, 2019 19 commits
- 修改订单统计 · b332abe2
  hanfeng authored Nov 06, 2019
  
  b332abe2
- Merge remote-tracking branch 'origin/master' · f733c9a4
  hanfeng authored Nov 06, 2019
  
  f733c9a4
- Merge branch 'master' of http://113.105.137.151:22280/youjj/cloud-platform · d2da464f
  hezhen authored Nov 06, 2019
  
  d2da464f
- 添加出车日志 · 14d775c9
  jiaorz authored Nov 06, 2019
  
  14d775c9
- 添加出车日志 · 48da574e
  jiaorz authored Nov 06, 2019
  
  48da574e
- Merge branch 'master' into base-modify · 4ec960be
  hanfeng authored Nov 06, 2019
  
  4ec960be
- 添加出车日志 · fee77fc7
  jiaorz authored Nov 06, 2019
  
  fee77fc7
- 添加出车日志 · cb283c02
  jiaorz authored Nov 06, 2019
  
  cb283c02
- 修改订单统计 · 6679062c
  hanfeng authored Nov 06, 2019
  
  6679062c
- 123 · 3d64d28b
  hezhen authored Nov 06, 2019
  
  3d64d28b
- Merge branch 'master-modify-background-bug-hf' into base-modify · 7dff958c
  hanfeng authored Nov 06, 2019
  
  7dff958c
- 修改租车订单 · 6a9638a5
  hanfeng authored Nov 06, 2019
  
  6a9638a5
- Merge branch 'master-modify-background-bug-hf' into base-modify · 860b98f7
  hanfeng authored Nov 06, 2019
  
  860b98f7
- 修改租车订单 · 760c618d
  hanfeng authored Nov 06, 2019
  
  760c618d
- 车型列表添加App显示接口 · 5494b4e4
  jiaorz authored Nov 06, 2019
  
  5494b4e4
- 车型列表添加App显示接口 · ca478502
  jiaorz authored Nov 06, 2019
  
  ca478502
- Merge remote-tracking branch 'origin/base-modify' into base-modify · 7955212e
  hanfeng authored Nov 06, 2019
  
  7955212e
- Merge branch 'master-modify-background-bug-hf' into base-modify · 63892349
  hanfeng authored Nov 06, 2019
```
# Conflicts:
#	ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml
```
  63892349
- 修改租车订单 · a9af589c
  hanfeng authored Nov 06, 2019
  
  a9af589c
05 Nov, 2019 7 commits
- 修改车辆还车公司同时修改车辆停靠分公司 · 29a10af7
  jiaorz authored Nov 05, 2019
  
  29a10af7
- 修改车辆还车公司同时修改车辆停靠分公司 · 20228094
  jiaorz authored Nov 05, 2019
  
  20228094
- Merge branch 'master-change-arrival-company' into base-modify · 0d647232
  jiaorz authored Nov 05, 2019
```
# Conflicts:
#	xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml
```
  0d647232
- 修改车辆还车公司同时修改车辆停靠分公司 · 7b070d13
  jiaorz authored Nov 05, 2019
  
  7b070d13
- 修改车辆还车公司同时修改车辆停靠分公司 · abd8be9e
  jiaorz authored Nov 05, 2019
  
  abd8be9e
- Merge branch 'hz_master' into base-modify · a9715369
  hezhen authored Nov 05, 2019
  
  a9715369
- 123 · d1753bbc
  hezhen authored Nov 05, 2019
  
  d1753bbc