Commits · 72630d9fa691a0b6800ef695958621f558c34bff · youjj / cloud-platform

13 Aug, 2019 2 commits
- 修改租車訂單地址，修改车辆预定时添加订单号 · 72630d9f
  jiaorz authored Aug 13, 2019
  
  72630d9f
- 修改租車訂單地址，修改车辆预定时添加订单号 · 54816dbc
  jiaorz authored Aug 13, 2019
  
  54816dbc
10 Aug, 2019 38 commits
- Merge branch 'dev' into 'master' · 5bbf3acc
  周健威 authored Aug 10, 2019
```
dev_master_merge

See merge request !4
```
  5bbf3acc
- Merge remote-tracking branch 'origin/dev' into dev · 056f807f
  周健威 authored Aug 10, 2019
  
  056f807f
- 修改代码 · 0f0da474
  周健威 authored Aug 10, 2019
  
  0f0da474
- Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev · 2c4ad6c5
  hezhen authored Aug 10, 2019
```
# Conflicts:
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/DataController.java
```
  2c4ad6c5
- 123 · 3cb35853
  hezhen authored Aug 10, 2019
  
  3cb35853
- Merge remote-tracking branch 'origin/dev' into dev · a3215034
  周健威 authored Aug 10, 2019
  
  a3215034
- 修改代码 · 970ee3a4
  周健威 authored Aug 10, 2019
  
  970ee3a4
- Merge remote-tracking branch 'origin/dev' into dev · c1914aee
  libin authored Aug 10, 2019
  
  c1914aee
- 钱包 · 6b290dfd
  libin authored Aug 10, 2019
  
  6b290dfd
- Merge remote-tracking branch 'origin/dev' into dev · 6668efe2
  周健威 authored Aug 10, 2019
  
  6668efe2
- 修改代码 · 2b3858fe
  周健威 authored Aug 10, 2019
  
  2b3858fe
- Merge remote-tracking branch 'origin/dev' into dev · da14f40e
  周健威 authored Aug 10, 2019
  
  da14f40e
- 修改代码 · d1d95f5a
  周健威 authored Aug 10, 2019
  
  d1d95f5a
- Merge branch 'dev' of http://10.5.52.3/youjj/cloud-platform into dev2 · 33a4258d
  hanfeng authored Aug 10, 2019
  
  33a4258d
- 修改用户管理 · 16fe9e8b
  hanfeng authored Aug 10, 2019
  
  16fe9e8b
- Merge remote-tracking branch 'origin/dev' into dev · f0503a40
  jiaorz authored Aug 10, 2019
```
# Conflicts:
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/OrderRentVehicleController.java
```
  f0503a40
- 修改租車訂單地址，修改车辆预定时添加订单号 · 871ce97b
  jiaorz authored Aug 10, 2019
  
  871ce97b
- Merge remote-tracking branch 'origin/dev' into dev · 461f5c5b
  libin authored Aug 10, 2019
  
  461f5c5b
- 钱包 · 857e3d93
  libin authored Aug 10, 2019
  
  857e3d93
- Merge remote-tracking branch 'origin/dev' into dev · 95d485a3
  周健威 authored Aug 10, 2019
  
  95d485a3
- 修改代码 · 43a943f6
  周健威 authored Aug 10, 2019
  
  43a943f6
- Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev · 370cc44a
  hezhen authored Aug 10, 2019
  
  370cc44a
- 123 · b4b508fb
  hezhen authored Aug 10, 2019
  
  b4b508fb
- Merge remote-tracking branch 'origin/dev' into dev · 637c75dc
  jiaorz authored Aug 10, 2019
  
  637c75dc
- 修改租車訂單地址，修改车辆预定时添加订单号 · a13a3e5b
  jiaorz authored Aug 10, 2019
  
  a13a3e5b
- 钱包 · 2a88acfe
  libin authored Aug 10, 2019
  
  2a88acfe
- Merge remote-tracking branch 'origin/dev' into dev · 8ff98abb
  周健威 authored Aug 10, 2019
  
  8ff98abb
- 修改bug · 0555e7c4
  周健威 authored Aug 10, 2019
  
  0555e7c4
- Merge remote-tracking branch 'origin/dev' into dev · 914595f4
  jiaorz authored Aug 10, 2019
  
  914595f4
- 修改租車訂單地址，修改车辆预定时添加订单号 · 69f5c934
  jiaorz authored Aug 10, 2019
  
  69f5c934
- Merge branch 'dev' of http://10.5.52.3/youjj/cloud-platform into dev2 · 34ec5b45
  hanfeng authored Aug 10, 2019
  
  34ec5b45
- 修改用户管理 · 9160bca0
  hanfeng authored Aug 10, 2019
  
  9160bca0
- Merge remote-tracking branch 'origin/dev' into dev · e00fe2ba
  周健威 authored Aug 10, 2019
  
  e00fe2ba
- 修改bug · 2a2dfbeb
  周健威 authored Aug 10, 2019
  
  2a2dfbeb
- Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev · 4f862260
  hezhen authored Aug 10, 2019
  
  4f862260
- 123 · 02675537
  hezhen authored Aug 10, 2019
  
  02675537
- Merge remote-tracking branch 'origin/dev' into dev2 · 8fe0e42d
  hanfeng authored Aug 10, 2019
  
  8fe0e42d
- 修改用户管理 · 5063044d
  hanfeng authored Aug 10, 2019
  
  5063044d