Commits · 4170f9076c6cc7bd268ba4a3bf38858caa8f5fd8 · youjj / cloud-platform

12 Nov, 2019 10 commits
- Merge branch 'master-bacground-im' into dev · 4170f907
  jiaorz authored Nov 12, 2019
  
  4170f907
- 添加日志异常处理 · 3c62483a
  jiaorz authored Nov 12, 2019
  
  3c62483a
- Merge branch 'master-bacground-im' into dev · 7852ec69
  jiaorz authored Nov 12, 2019
  
  7852ec69
- 添加日志异常处理 · 2002770e
  jiaorz authored Nov 12, 2019
  
  2002770e
- 添加日志异常处理 · b1a31b3d
  jiaorz authored Nov 12, 2019
  
  b1a31b3d
- Merge branch 'master-bacground-im' into dev · befc49d0
  jiaorz authored Nov 12, 2019
  
  befc49d0
- 添加日志异常处理 · 77d0142d
  jiaorz authored Nov 12, 2019
  
  77d0142d
- Merge branch 'master-bacground-im' into dev · 8b75849c
  jiaorz authored Nov 12, 2019
  
  8b75849c
- 分公司删除bug · 485d1cf5
  jiaorz authored Nov 12, 2019
  
  485d1cf5
- Merge branch 'master-modify-background-bug-hf' into dev · 06bfb208
  hanfeng authored Nov 12, 2019
  
  06bfb208
11 Nov, 2019 30 commits
- 修改车辆信息 · 83fbd9b9
  hanfeng authored Nov 11, 2019
  
  83fbd9b9
- Merge branch 'master-modify-background-bug-hf' into dev · 7d378098
  hanfeng authored Nov 11, 2019
```
# Conflicts:
#	ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppUserManageDTO.java
#	ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml
```
  7d378098
- 修改车辆信息 · 485008fc
  hanfeng authored Nov 11, 2019
  
  485008fc
- 修改车辆信息 · f2b6be98
  hanfeng authored Nov 11, 2019
  
  f2b6be98
- Merge branch 'master-modify-background-bug-hf' into dev · b2ff76fd
  hanfeng authored Nov 11, 2019
  
  b2ff76fd
- 修改车辆信息 · 5109b6d3
  hanfeng authored Nov 11, 2019
  
  5109b6d3
- Merge remote-tracking branch 'origin/dev' into dev · 88d7e72d
  hanfeng authored Nov 11, 2019
  
  88d7e72d
- Merge branch 'master-modify-background-bug-hf' into dev · 2a3263c4
  hanfeng authored Nov 11, 2019
```
# Conflicts:
#	ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppUserManageDTO.java
#	ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml
```
  2a3263c4
- 修改车辆信息 · b1aadd97
  hanfeng authored Nov 11, 2019
  
  b1aadd97
- Merge remote-tracking branch 'origin/dev' into dev · 6da6d4f9
  周健威 authored Nov 11, 2019
  
  6da6d4f9
- Merge branch 'master-zjw' into dev · 0eacf2ff
  周健威 authored Nov 11, 2019
  
  0eacf2ff
- 修改退第一笔押金bug · 0ed3f666
  周健威 authored Nov 11, 2019
  
  0ed3f666
- Merge branch 'master-order-departure' into dev · a902fd31
  jiaorz authored Nov 11, 2019
  
  a902fd31
- 修改核销验收人bug · 5d803073
  jiaorz authored Nov 11, 2019
  
  5d803073
- 修改车辆信息 · 48f5ae9e
  hanfeng authored Nov 11, 2019
  
  48f5ae9e
- 修改车辆信息 · d9fa338d
  hanfeng authored Nov 11, 2019
  
  d9fa338d
- 后台分公司筛选问题 · 444ecee1
  jiaorz authored Nov 11, 2019
  
  444ecee1
- Merge branch 'master-modify-background-bug-hf' into dev · 3d3afab7
  hanfeng authored Nov 11, 2019
  
  3d3afab7
- 修改用户信息接口 · 9a750f29
  hanfeng authored Nov 11, 2019
  
  9a750f29
- Merge remote-tracking branch 'origin/dev' into dev · c9beb518
  周健威 authored Nov 11, 2019
  
  c9beb518
- Merge branch 'master-zjw' into dev · 5368e2fa
  周健威 authored Nov 11, 2019
  
  5368e2fa
- 修改最后一笔钱退款时间bug · 6d6f6ab1
  周健威 authored Nov 11, 2019
  
  6d6f6ab1
- Merge branch 'master-bacground-im' into dev · dcc4ab14
  jiaorz authored Nov 11, 2019
  
  dcc4ab14
- 后台分公司筛选问题 · ed515b7a
  jiaorz authored Nov 11, 2019
  
  ed515b7a
- 延期还车费用 · 3477c532
  jiaorz authored Nov 11, 2019
  
  3477c532
- 修改获取用户信息接口 · 88657fb0
  hanfeng authored Nov 11, 2019
  
  88657fb0
- Merge remote-tracking branch 'origin/dev' into dev · 91115283
  周健威 authored Nov 11, 2019
  
  91115283
- Merge branch 'holiday-price' into dev · 8b61d5c7
  周健威 authored Nov 11, 2019
  
  8b61d5c7
- 修改bug · 4492f271
  周健威 authored Nov 11, 2019
  
  4492f271
- Merge remote-tracking branch 'origin/dev' into dev · 0287d6b1
  hanfeng authored Nov 11, 2019
  
  0287d6b1