Commits · 6d752c8290dc67d86a00a7faecfca47a1a7224a4 · youjj / cloud-platform-ui

22 Nov, 2019 11 commits
- Merge remote-tracking branch 'origin/base-modify' into base-modify-hf · 6d752c82
  hanfeng authored Nov 22, 2019
```
# Conflicts:
#	src/views/order/modal/rentOrderDetailModal.vue
```
  6d752c82
- 修改车辆订单详情 · 0812449a
  hanfeng authored Nov 22, 2019
  
  0812449a
- 修改员工身份 · 75651711
  jiaorz authored Nov 22, 2019
  
  75651711
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform-ui into base-modify · 251a420e
  jiaorz authored Nov 22, 2019
  
  251a420e
- 新增员工身份字段 · 5a88e93e
  jiaorz authored Nov 22, 2019
  
  5a88e93e
- 修改车辆订单详情 · f0c12b04
  hanfeng authored Nov 22, 2019
  
  f0c12b04
- Merge remote-tracking branch 'origin/base-modify' into base-modify-hf · a239eedb
  hanfeng authored Nov 22, 2019
  
  a239eedb
- 修改车辆订单详情 · ff6ecafc
  hanfeng authored Nov 22, 2019
  
  ff6ecafc
- Merge branch 'master-vehicle-count' into base-modify · d759e704
  jiaorz authored Nov 22, 2019
  
  d759e704
- 车辆信息统计 · 28277d90
  jiaorz authored Nov 22, 2019
  
  28277d90
- Merge remote-tracking branch 'origin/base-modify' into base-modify-hf · 88e8a800
  hanfeng authored Nov 22, 2019
  
  88e8a800
21 Nov, 2019 3 commits
- 租车价格表判断 · e99278af
  guoyou authored Nov 21, 2019
  
  e99278af
- 租车价格日历,筛选样式调整 · 04e21fba
  guoyou authored Nov 21, 2019
  
  04e21fba
- 租车价格日历 · 27ae43ee
  guoyou authored Nov 21, 2019
  
  27ae43ee
19 Nov, 2019 16 commits
- 价格日历 · c8074be3
  guoyou authored Nov 19, 2019
  
  c8074be3
- 修改后台订单 · 6c12f9ea
  jiaorz authored Nov 19, 2019
  
  6c12f9ea
- 后台订单 · 0baae5b7
  jiaorz authored Nov 19, 2019
  
  0baae5b7
- Merge branch 'base-modify' · bc6796e1
  hezhen authored Nov 19, 2019
```
# Conflicts:
#	src/views/order/rentVehicleInfo/index.vue
```
  bc6796e1
- 显示多次点击 · 67eeab46
  guoyou authored Nov 19, 2019
  
  67eeab46
- Merge remote-tracking branch 'origin/base-modify' into base-modify-hf · 8ff39948
  hanfeng authored Nov 19, 2019
  
  8ff39948
- 提现记录审核 · ce15bf08
  guoyou authored Nov 19, 2019
  
  ce15bf08
- Merge remote-tracking branch 'origin/base-modify' into base-modify-hf · acbbe7fc
  hanfeng authored Nov 19, 2019
```
# Conflicts:
#	.gitignore
```
  acbbe7fc
- 提现记录审核 · 56f7ca0c
  guoyou authored Nov 19, 2019
  
  56f7ca0c
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform-ui into base-modify · 77bd3db7
  guoyou authored Nov 19, 2019
  
  77bd3db7
- 提现记录,收款账号 · 913eb2db
  guoyou authored Nov 19, 2019
  
  913eb2db
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform-ui into base-modify · 005bef9a
  jiaorz authored Nov 19, 2019
  
  005bef9a
- 123 · bc74d7c4
  jiaorz authored Nov 19, 2019
  
  bc74d7c4
- 租车价格表 · 6ad27a43
  guoyou authored Nov 19, 2019
  
  6ad27a43
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform-ui into base-modify · d6f68dc0
  guoyou authored Nov 19, 2019
  
  d6f68dc0
- 佣金记录来源 · c7d8bacc
  guoyou authored Nov 19, 2019
  
  c7d8bacc
18 Nov, 2019 10 commits
- Merge remote-tracking branch 'remotes/origin/master-bg-vehicle' · 07e1e4b6
  jiaorz authored Nov 18, 2019
  
  07e1e4b6
- 123 · 66b9a104
  jiaorz authored Nov 18, 2019
  
  66b9a104
- Merge branch 'master-bg' · f4491eda
  jiaorz authored Nov 18, 2019
  
  f4491eda
- 去除日志 · 04c354ef
  jiaorz authored Nov 18, 2019
  
  04c354ef
- 后台订单修改 · 0def88f5
  jiaorz authored Nov 18, 2019
  
  0def88f5
- 后台订单详情修改 · c8eb2c6a
  jiaorz authored Nov 18, 2019
  
  c8eb2c6a
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform-ui into base-modify · 0dd9baa9
  jiaorz authored Nov 18, 2019
  
  0dd9baa9
- Merge branch 'master-bg' into base-modify · a4f61b01
  jiaorz authored Nov 18, 2019
  
  a4f61b01
- 旅游订单列表 · c3ee4a48
  jiaorz authored Nov 18, 2019
  
  c3ee4a48
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform-ui into base-modify · 54e2f354
  guoyou authored Nov 18, 2019
  
  54e2f354