Commits · 4ed8f5362ab8b42d64408af9852bb02db95657c1 · youjj / cloud-platform-ui

17 Aug, 2019 6 commits
- Merge remote-tracking branch 'remotes/origin/base-modify' · 4ed8f536
  lixy authored Aug 17, 2019
  
  4ed8f536
- bug · 3da3fe8c
  denghr authored Aug 17, 2019
  
  3da3fe8c
- 用户列表 · 0b5e32dc
  denghr authored Aug 17, 2019
  
  0b5e32dc
- 会员列表的修改 · 4d32206c
  denghr authored Aug 17, 2019
  
  4d32206c
- 排班表取消预订，驳回接口修改 · 267d438a
  denghr authored Aug 17, 2019
  
  267d438a
- 车辆信息、车辆排班 · a9b6fcac
  denghr authored Aug 17, 2019
  
  a9b6fcac
16 Aug, 2019 10 commits
- 首页 · 9b668b53
  lixy authored Aug 16, 2019
  
  9b668b53
- 车型列表 · ac5f983a
  lixy authored Aug 16, 2019
  
  ac5f983a
- 车牌号字段 · 9b697150
  denghr authored Aug 16, 2019
  
  9b697150
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform-ui into base-modify · e58d8cb3
  denghr authored Aug 16, 2019
  
  e58d8cb3
- 驳回理由、排班按钮权限、车辆信息车辆状态修改 · 24086b1a
  denghr authored Aug 16, 2019
  
  24086b1a
- 旅游-必填项添加 · 62a9703a
  lixy authored Aug 16, 2019
  
  62a9703a
- 营地列表-必填项添加 · 43fa21bc
  lixy authored Aug 16, 2019
  
  43fa21bc
- 营地经纬度必填 · 5e2a800b
  lixy authored Aug 16, 2019
  
  5e2a800b
- 会员管理 · 4e66ddf5
  lixy authored Aug 16, 2019
  
  4e66ddf5
- 修改后台用户列表,编辑 · 1a2de475
  hanfeng authored Aug 16, 2019
  
  1a2de475
15 Aug, 2019 6 commits
- 后端没处理，重新配车先注释 · 15b155f0
  denghr authored Aug 15, 2019
  
  15b155f0
- 1 · 42aba1d2
  denghr authored Aug 15, 2019
  
  42aba1d2
- 排期起止日期 · 46d021b1
  lixy authored Aug 15, 2019
  
  46d021b1
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform-ui into base-modify · e3102550
  hanfeng authored Aug 15, 2019
```
# Conflicts:
#	src/views/appManagement/appVersion/index.vue
```
  e3102550
- 修改后台用户管理 · 38b6fb33
  hanfeng authored Aug 15, 2019
  
  38b6fb33
- 营地背景海报、车辆重新分配 · 6b0d1afb
  denghr authored Aug 15, 2019
  
  6b0d1afb
14 Aug, 2019 6 commits
- app版本管理、分公司管理 · cc9ad312
  denghr authored Aug 14, 2019
  
  cc9ad312
- 首页 · 89769f13
  denghr authored Aug 14, 2019
  
  89769f13
- 首页 · 259b4187
  denghr authored Aug 14, 2019
  
  259b4187
- bug · 8f393ba5
  denghr authored Aug 14, 2019
  
  8f393ba5
- 旅游活动天数计算 · 9d195699
  lixy authored Aug 14, 2019
  
  9d195699
- bug · d50e5922
  denghr authored Aug 14, 2019
  
  d50e5922
13 Aug, 2019 6 commits
- 预定中 · b661c3ac
  lixy authored Aug 13, 2019
  
  b661c3ac
- 手机号验证、预约中 · 50b410bf
  lixy authored Aug 13, 2019
  
  50b410bf
- 预约中 · 8ba4a963
  lixy authored Aug 13, 2019
  
  8ba4a963
- 活动行为记录、按钮权限 · a2ec419f
  denghr authored Aug 13, 2019
  
  a2ec419f
- 车辆排班记录 · 992ce157
  lixy authored Aug 13, 2019
  
  992ce157
- 排班记录 · f4d747db
  lixy authored Aug 13, 2019
  
  f4d747db
12 Aug, 2019 4 commits
- 分公司管理 · 61ac96b7
  lixy authored Aug 12, 2019
  
  61ac96b7
- 按钮权限 · a28199bb
  denghr authored Aug 12, 2019
  
  a28199bb
- 随车物品和车辆排班修改 · 7354dfb2
  denghr authored Aug 12, 2019
  
  7354dfb2
- 车辆排班 · a099a446
  denghr authored Aug 12, 2019
  
  a099a446
10 Aug, 2019 2 commits
- 1 · 6eb64431
  denghr authored Aug 10, 2019
  
  6eb64431
- 111 · 3ba1a0f8
  denghr authored Aug 10, 2019
  
  3ba1a0f8