Commits · f3a57c3fb0d8d2b34a051507d712333aaf3c804b · youjj / cloud-platform

24 Jun, 2019 9 commits
- Merge remote-tracking branch 'origin/base-modify' into base-modify · f3a57c3f
  hanfeng authored Jun 24, 2019
  
  f3a57c3f
- 营地 · 4a9b85f6
  libin authored Jun 24, 2019
  
  4a9b85f6
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · b092f1b6
  libin authored Jun 24, 2019
  
  b092f1b6
- 营地 · 7e916847
  libin authored Jun 24, 2019
  
  7e916847
- 取消使用优惠卷 · 1ef5a4d3
  hezhen authored Jun 24, 2019
  
  1ef5a4d3
- 1Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · 694840ff
  hezhen authored Jun 24, 2019
```
# Conflicts:
#	xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/Feign/ActivityFeign.java
```
  694840ff
- 123 · 6e9d49e1
  hezhen authored Jun 24, 2019
  
  6e9d49e1
- Merge branch 'base-modify' of http://10.5.52.3/youjj/cloud-platform into base-modify · db6d6446
  hanfeng authored Jun 24, 2019
  
  db6d6446
- 修改获取区域接口 · 448a9ab0
  hanfeng authored Jun 24, 2019
  
  448a9ab0
22 Jun, 2019 16 commits
- 营地 · 81283058
  libin authored Jun 22, 2019
  
  81283058
- 修改查询 · 416e02fc
  jiaorz authored Jun 22, 2019
  
  416e02fc
- 修改代码 · c34d873d
  周健威 authored Jun 22, 2019
  
  c34d873d
- 修改代码 · efcdfd23
  周健威 authored Jun 22, 2019
  
  efcdfd23
- Merge remote-tracking branch 'origin/base-modify' into base-modify · 7b44128e
  jiaorz authored Jun 22, 2019
  
  7b44128e
- 修改查询 · 6d050e4b
  jiaorz authored Jun 22, 2019
  
  6d050e4b
- 营地 · d4d4491d
  libin authored Jun 22, 2019
  
  d4d4491d
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · 00939e26
  libin authored Jun 22, 2019
  
  00939e26
- 营地、评价 · 008339bb
  libin authored Jun 22, 2019
  
  008339bb
- 添加队列代码 · 10925dc8
  周健威 authored Jun 22, 2019
  
  10925dc8
- 修改查询 · 2ba0282e
  jiaorz authored Jun 22, 2019
  
  2ba0282e
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · 1428b34e
  hezhen authored Jun 22, 2019
  
  1428b34e
- 添加优惠卷模块 · 84f73675
  hezhen authored Jun 22, 2019
  
  84f73675
- 1233 · be341868
  hezhen authored Jun 22, 2019
  
  be341868
- Merge branch 'base-modify' of http://10.5.52.3/youjj/cloud-platform into base-modify · 3a3f4a03
  hanfeng authored Jun 22, 2019
  
  3a3f4a03
- 修改车型列表 · 74eeec93
  hanfeng authored Jun 22, 2019
  
  74eeec93
21 Jun, 2019 15 commits
- 123 · 82ea34b7
  hezhen authored Jun 21, 2019
  
  82ea34b7
- 123 · a86c11f4
  hezhen authored Jun 21, 2019
  
  a86c11f4
- 123 · 4cd8586b
  hezhen authored Jun 21, 2019
  
  4cd8586b
- 修改实名认证 · 6e512373
  hezhen authored Jun 21, 2019
  
  6e512373
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · aaaee09f
  hezhen authored Jun 21, 2019
  
  aaaee09f
- 添加优惠卷 · 00eda213
  hezhen authored Jun 21, 2019
  
  00eda213
- 修改查询 · d8c803ef
  jiaorz authored Jun 21, 2019
  
  d8c803ef
- Merge remote-tracking branch 'origin/base-modify' into base-modify · 9fd85723
  jiaorz authored Jun 21, 2019
  
  9fd85723
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · 767f5cac
  jiaorz authored Jun 21, 2019
```
# Conflicts:
#	xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleController.java
```
  767f5cac
- 发现 · e758708e
  wuwz authored Jun 21, 2019
  
  e758708e
- 新增汽车预定时间信息表 · 8252d27d
  jiaorz authored Jun 21, 2019
  
  8252d27d
- 添加优惠卷 · 38baf36c
  hezhen authored Jun 21, 2019
  
  38baf36c
- 营地 · 08c2af74
  libin authored Jun 21, 2019
  
  08c2af74
- 营地 · 462f54e1
  libin authored Jun 21, 2019
  
  462f54e1
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · a9a9ec15
  libin authored Jun 21, 2019
  
  a9a9ec15