Commits · cedffdb51f43098daf5e7e54d75bc02e41d02c17 · youjj / cloud-platform

22 Nov, 2019 37 commits
- Merge branch 'master-log-test' into dev · cedffdb5
  jiaorz authored Nov 22, 2019
  
  cedffdb5
- 添加admin日志拦截 · d25b7a96
  jiaorz authored Nov 22, 2019
  
  d25b7a96
- Merge branch 'master-arrival-bug' · f4e7212e
  jiaorz authored Nov 22, 2019
  
  f4e7212e
- Merge branch 'master-background-bug' · 8cadf5b8
  jiaorz authored Nov 22, 2019
  
  8cadf5b8
- Merge branch 'master-modify-background-bug-hf' into dev · cc1a98c5
  hanfeng authored Nov 22, 2019
  
  cc1a98c5
- 修改车辆订单详情 · e315800c
  hanfeng authored Nov 22, 2019
  
  e315800c
- Merge branch 'master-arrival-bug' into dev · 0dff3547
  jiaorz authored Nov 22, 2019
  
  0dff3547
- 取消修改还车公司时修改车辆停靠分公司需求 · c6dc4122
  jiaorz authored Nov 22, 2019
  
  c6dc4122
- Merge branch 'master-background-bug' into dev · bae1d847
  jiaorz authored Nov 22, 2019
  
  bae1d847
- 后台订单列表修改 · d72078a1
  jiaorz authored Nov 22, 2019
  
  d72078a1
- 后台订单列表修改 · 318a2227
  jiaorz authored Nov 22, 2019
  
  318a2227
- Merge remote-tracking branch 'origin/dev' into dev · 28037675
  hanfeng authored Nov 22, 2019
  
  28037675
- Merge branch 'master-modify-background-bug-hf' into dev · 7056c877
  hanfeng authored Nov 22, 2019
  
  7056c877
- Merge branch 'master-vehicle-bg' into dev · d2e40167
  jiaorz authored Nov 22, 2019
  
  d2e40167
- 车辆信息统计 · bf8a49e6
  jiaorz authored Nov 22, 2019
  
  bf8a49e6
- 修改车辆订单详情 · 426a4b32
  hanfeng authored Nov 22, 2019
  
  426a4b32
- 车辆信息统计 · 1a9caf7b
  jiaorz authored Nov 22, 2019
  
  1a9caf7b
- 修改车辆订单详情 · d0c6070a
  hanfeng authored Nov 22, 2019
  
  d0c6070a
- Merge remote-tracking branch 'origin/dev' into dev · f9fee30b
  jiaorz authored Nov 22, 2019
  
  f9fee30b
- Merge branch 'master-vehicle-bg' into dev · 1acef53f
  jiaorz authored Nov 22, 2019
  
  1acef53f
- 车辆信息统计 · 2eb539bd
  jiaorz authored Nov 22, 2019
  
  2eb539bd
- Merge remote-tracking branch 'origin/dev' into dev · bb9ec026
  周健威 authored Nov 22, 2019
  
  bb9ec026
- Merge remote-tracking branch 'origin/master_position' into dev · e066a57f
  周健威 authored Nov 22, 2019
  
  e066a57f
- 添加下单公司、员工id记录 · a22ca4e0
  周健威 authored Nov 22, 2019
  
  a22ca4e0
- Merge branch 'master-vehicle-bg' into dev · de5cd606
  jiaorz authored Nov 22, 2019
  
  de5cd606
- 车辆信息统计 · d3d0c79a
  jiaorz authored Nov 22, 2019
  
  d3d0c79a
- 车辆信息统计 · f49101e4
  jiaorz authored Nov 22, 2019
  
  f49101e4
- 添加上级职位 · bf425da4
  hezhen authored Nov 22, 2019
  
  bf425da4
- 车辆信息统计 · a200db23
  jiaorz authored Nov 22, 2019
  
  a200db23
- Merge branch 'master-vehicle-bg' into dev · bf69e760
  jiaorz authored Nov 22, 2019
  
  bf69e760
- 车辆信息统计 · e39bdc8f
  jiaorz authored Nov 22, 2019
  
  e39bdc8f
- 车辆信息统计 · 76915e03
  jiaorz authored Nov 22, 2019
  
  76915e03
- 车辆信息统计 · affed470
  jiaorz authored Nov 22, 2019
  
  affed470
- 车辆信息统计 · a25ab40c
  jiaorz authored Nov 22, 2019
  
  a25ab40c
- 车辆信息统计 · 48b82b2b
  jiaorz authored Nov 22, 2019
  
  48b82b2b
- Merge remote-tracking branch 'origin/dev' into dev · e75b3106
  jiaorz authored Nov 22, 2019
  
  e75b3106
- Merge branch 'master-vehicle-bg' into dev · 1f77940c
  jiaorz authored Nov 22, 2019
  
  1f77940c
21 Nov, 2019 3 commits
- 车辆信息统计 · d2b5abe6
  jiaorz authored Nov 21, 2019
  
  d2b5abe6
- Merge branch 'master-modify-background-bug-hf' into dev · 7756b2aa
  hanfeng authored Nov 21, 2019
```
# Conflicts:
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BackStageOrderController.java
#	xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/CertificationService.java
```
  7756b2aa
- Merge branch 'master' into master-modify-background-bug-hf · 3cb7d75c
  hanfeng authored Nov 21, 2019
  
  3cb7d75c