Commits · 2e0c04db921cd21ea075bd42832a17aca14d6ddb · youjj / cloud-platform

13 Aug, 2019 37 commits
- Merge branch 'dev' into 'master' · 2e0c04db
  周健威 authored Aug 13, 2019
```
Dev-master-merge-0813

See merge request !5
```
  2e0c04db
- Merge remote-tracking branch 'origin/dev' into dev · 0e1f8e85
  jiaorz authored Aug 13, 2019
```
# Conflicts:
#	xx-user-behavior-collect/xx-user-behavior-server/src/main/java/com/xxfc/platform/user/behavior/biz/CustomerBehaviorNotesBiz.java
```
  0e1f8e85
- 修改租車訂單地址，修改车辆预定时添加订单号 · ef6943dc
  jiaorz authored Aug 13, 2019
  
  ef6943dc
- 修改租車訂單地址，修改车辆预定时添加订单号 · fb35e713
  jiaorz authored Aug 13, 2019
  
  fb35e713
- 行为日志记录 · 896fdd35
  libin authored Aug 13, 2019
  
  896fdd35
- 行为日志记录 · 1dc321a9
  libin authored Aug 13, 2019
  
  1dc321a9
- 修改租車訂單地址，修改车辆预定时添加订单号 · 72630d9f
  jiaorz authored Aug 13, 2019
  
  72630d9f
- 修改租車訂單地址，修改车辆预定时添加订单号 · 54816dbc
  jiaorz authored Aug 13, 2019
  
  54816dbc
- 修改租車訂單地址，修改车辆预定时添加订单号 · 120d1204
  jiaorz authored Aug 13, 2019
  
  120d1204
- 修改租車訂單地址，修改车辆预定时添加订单号 · 1135a1f0
  jiaorz authored Aug 13, 2019
  
  1135a1f0
- Merge branch 'dev' into base-modify · dae3b657
  jiaorz authored Aug 13, 2019
  
  dae3b657
- 行为记录 · 30138aaf
  libin authored Aug 13, 2019
  
  30138aaf
- 行为日志记录 · 291a8ccf
  libin authored Aug 13, 2019
  
  291a8ccf
- 123 · 4ecde1ea
  hezhen authored Aug 13, 2019
  
  4ecde1ea
- Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev · a576eae6
  hezhen authored Aug 13, 2019
  
  a576eae6
- 123 · 914a4116
  hezhen authored Aug 13, 2019
  
  914a4116
- 123 · 8dd220ed
  hezhen authored Aug 13, 2019
  
  8dd220ed
- 123 · 5b1a592b
  hezhen authored Aug 13, 2019
  
  5b1a592b
- 修改租車訂單地址，修改车辆预定时添加订单号 · 684d1296
  jiaorz authored Aug 13, 2019
  
  684d1296
- 修改租車訂單地址，修改车辆预定时添加订单号 · 8163378d
  jiaorz authored Aug 13, 2019
  
  8163378d
- 修改租車訂單地址，修改车辆预定时添加订单号 · 2952a647
  jiaorz authored Aug 13, 2019
  
  2952a647
- Merge remote-tracking branch 'origin/dev' into dev · 0cc595ff
  jiaorz authored Aug 13, 2019
  
  0cc595ff
- 修改租車訂單地址，修改车辆预定时添加订单号 · d73efe5b
  jiaorz authored Aug 13, 2019
  
  d73efe5b
- Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev · aef33454
  hezhen authored Aug 13, 2019
  
  aef33454
- 123 · d7312e81
  hezhen authored Aug 13, 2019
  
  d7312e81
- Merge remote-tracking branch 'origin/dev' into dev · 4cbc45f1
  jiaorz authored Aug 13, 2019
  
  4cbc45f1
- 修改租車訂單地址，修改车辆预定时添加订单号 · 64e2e7e2
  jiaorz authored Aug 13, 2019
  
  64e2e7e2
- Merge remote-tracking branch 'origin/dev' into dev · 294fefbf
  libin authored Aug 13, 2019
  
  294fefbf
- 行为记录 · 1077735a
  libin authored Aug 13, 2019
  
  1077735a
- 修改租車訂單地址，修改车辆预定时添加订单号 · c82d506b
  jiaorz authored Aug 13, 2019
  
  c82d506b
- 修改租車訂單地址，修改车辆预定时添加订单号 · 7451eb16
  jiaorz authored Aug 13, 2019
  
  7451eb16
- Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev · bf9c6136
  hezhen authored Aug 13, 2019
  
  bf9c6136
- 123 · d9ea0851
  hezhen authored Aug 13, 2019
  
  d9ea0851
- Merge remote-tracking branch 'origin/dev' into dev · 789cd524
  jiaorz authored Aug 13, 2019
  
  789cd524
- 修改租車訂單地址，修改车辆预定时添加订单号 · 9a521569
  jiaorz authored Aug 13, 2019
  
  9a521569
- Merge remote-tracking branch 'origin/dev' into dev · db119a26
  jiaorz authored Aug 13, 2019
  
  db119a26
- 修改租車訂單地址，修改车辆预定时添加订单号 · c08b69ac
  jiaorz authored Aug 13, 2019
  
  c08b69ac
12 Aug, 2019 3 commits
- Merge remote-tracking branch 'origin/dev' into dev · f875ed9a
  周健威 authored Aug 12, 2019
  
  f875ed9a
- 修改装换bug · f5eda729
  周健威 authored Aug 12, 2019
  
  f5eda729
- Merge remote-tracking branch 'origin/dev' into dev · 77adbcaf
  jiaorz authored Aug 12, 2019
  
  77adbcaf