Commits · 06dc017c878edbf926f864dbd846a9db18ea94db · youjj / cloud-platform

24 Jan, 2020 1 commit
- 放开注册和会员购买 · 06dc017c
  xiaosl authored Jan 24, 2020
  
  06dc017c
17 Jan, 2020 8 commits
- Merge branch 'master_admin0117' into master2 · 8c5e6968
  hanfeng authored Jan 17, 2020
  
  8c5e6968
- Merge remote-tracking branch 'origin/master' into master2 · 859fabc4
  hanfeng authored Jan 17, 2020
  
  859fabc4
- Merge remote-tracking branch 'origin/master_admin0117' into master_admin0117 · 0e149868
  hanfeng authored Jan 17, 2020
  
  0e149868
- 开票 · 19ed2228
  hanfeng authored Jan 17, 2020
  
  19ed2228
- 开票 · 0ff28b77
  hanfeng authored Jan 17, 2020
  
  0ff28b77
- Merge branch 'master_admin0117' of... · 1c5a91d2
  hezhen authored Jan 17, 2020
```
Merge branch 'master_admin0117' of http://113.105.137.151:22280/youjj/cloud-platform into master_admin0117
```
  1c5a91d2
- 123 · 26990723
  hezhen authored Jan 17, 2020
  
  26990723
- 开票 · 4e1cef72
  hanfeng authored Jan 17, 2020
  
  4e1cef72
15 Jan, 2020 1 commit
- 123 · a8ff4d9d
  hezhen authored Jan 15, 2020
  
  a8ff4d9d
10 Jan, 2020 1 commit
- 会员变更记录空判断 · 5f608647
  libin authored Jan 10, 2020
  
  5f608647
08 Jan, 2020 3 commits
- Merge branch 'master-order' · adfab16b
  jiaorz authored Jan 08, 2020
  
  adfab16b
- 会员订单禁用 · 9a1a0f0d
  jiaorz authored Jan 08, 2020
  
  9a1a0f0d
- 会员订单禁用 · 1abac7c9
  jiaorz authored Jan 08, 2020
  
  1abac7c9
07 Jan, 2020 1 commit
- Merge branch 'master-vehicle-count-bug' · 7e60347b
  jiaorz authored Jan 07, 2020
  
  7e60347b
06 Jan, 2020 5 commits
- 取消下单 · 03e07a5b
  jiaorz authored Jan 06, 2020
  
  03e07a5b
- 取消下单 · 3f1b6667
  jiaorz authored Jan 06, 2020
  
  3f1b6667
- 取消下单 · 8ff521e7
  jiaorz authored Jan 06, 2020
  
  8ff521e7
- 取消下单 · 3b50a704
  jiaorz authored Jan 06, 2020
  
  3b50a704
- 车辆统计修改导出数据 · 76cd3c2e
  jiaorz authored Jan 06, 2020
  
  76cd3c2e
03 Jan, 2020 6 commits
- 修改车辆详情 · e5c25af4
  hanfeng authored Jan 03, 2020
  
  e5c25af4
- 车辆统计修改导出数据 · 183614b7
  jiaorz authored Jan 03, 2020
  
  183614b7
- 车辆统计修改导出数据 · 545f48b2
  jiaorz authored Jan 03, 2020
  
  545f48b2
- 车辆统计修改导出数据 · f4a481f5
  jiaorz authored Jan 03, 2020
  
  f4a481f5
- 车辆统计修改导出数据 · ce3dbc1a
  jiaorz authored Jan 03, 2020
  
  ce3dbc1a
- Merge branch 'master' into master-vehicle-count-bug · fefa6908
  jiaorz authored Jan 03, 2020
  
  fefa6908
01 Jan, 2020 2 commits
- 修改租车预约车辆时间 · 431b80f6
  周健威 authored Jan 01, 2020
  
  431b80f6
- 修改租车预约车辆时间 · 33f8d1bd
  周健威 authored Jan 01, 2020
  
  33f8d1bd
31 Dec, 2019 12 commits
- 修改租车预约车辆时间 · 29484629
  周健威 authored Dec 31, 2019
  
  29484629
- Merge branch 'master-zjw' · 40831645
  周健威 authored Dec 31, 2019
  
  40831645
- Merge branch 'staff-upd-vehicle-File' · 679f197e
  zuoyh authored Dec 31, 2019
  
  679f197e
- 股东变更详情查询排序 · 5dfd9889
  zuoyh authored Dec 31, 2019
  
  5dfd9889
- Merge remote-tracking branch 'origin/master' into master2 · 85bc5102
  hanfeng authored Dec 31, 2019
  
  85bc5102
- Merge branch 'master-bug-vehiclemodel-hf' into master2 · 1af06660
  hanfeng authored Dec 31, 2019
```
# Conflicts:
#	xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/rest/VehicleModelController.java
```
  1af06660
- Merge branch 'saff_update_feature' · 232d7263
  libin authored Dec 31, 2019
  
  232d7263
- Merge remote-tracking branch 'origin/master' · 3288da26
  libin authored Dec 31, 2019
  
  3288da26
- 股东变更详情查询排序 · c4e95e9d
  zuoyh authored Dec 31, 2019
  
  c4e95e9d
- 1 · 21db4ea4
  jiaorz authored Dec 31, 2019
  
  21db4ea4
- Merge branch 'master-vehicle-bug' · 3b771d16
  jiaorz authored Dec 31, 2019
  
  3b771d16
- 1 · edbc22e6
  jiaorz authored Dec 31, 2019
  
  edbc22e6