Commits · 38baf36c3031412c01974a2f37688b43ad4c4ab1 · youjj / cloud-platform

21 Jun, 2019 7 commits
- 添加优惠卷 · 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
- 营地 · 7731e8bc
  libin authored Jun 21, 2019
  
  7731e8bc
- Merge branch 'base-modify' of http://10.5.52.3/youjj/cloud-platform into base-modify · 275710c2
  hanfeng authored Jun 21, 2019
```
# Conflicts:
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/AdminBootstrap.java
```
  275710c2
- 修改车型管理 · c22fbd38
  hanfeng authored Jun 21, 2019
  
  c22fbd38
20 Jun, 2019 21 commits
- 123 · 73f712bc
  hezhen authored Jun 20, 2019
  
  73f712bc
- 修改id · 9f72e1ee
  hezhen authored Jun 20, 2019
  
  9f72e1ee
- 123 · 647fb36b
  hezhen authored Jun 20, 2019
  
  647fb36b
- 1233 · 81f827d8
  hezhen authored Jun 20, 2019
  
  81f827d8
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · dba27030
  hezhen authored Jun 20, 2019
  
  dba27030
- 修改收藏 · 3537df7c
  hezhen authored Jun 20, 2019
  
  3537df7c
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · ee8ddb50
  libin authored Jun 20, 2019
  
  ee8ddb50
- 使用Feign的时候,如果参数中带有 @PathVariable形式的参数,则要用value=""标明对应的参数,否则会抛出IllegalStateException异常 · 453c8df1
  libin authored Jun 20, 2019
  
  453c8df1
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · 1847dccc
  hezhen authored Jun 20, 2019
  
  1847dccc
- 修改收藏 · c3effd4e
  hezhen authored Jun 20, 2019
  
  c3effd4e
- 修改取消等代码 · c7f48b7d
  周健威 authored Jun 20, 2019
  
  c7f48b7d
- Merge branch 'base-modify' of http://10.5.52.3/youjj/cloud-platform into base-modify · c51f9687
  hanfeng authored Jun 20, 2019
  
  c51f9687
- 局部修改 · ffaab5f5
  hanfeng authored Jun 20, 2019
  
  ffaab5f5
- 新增汽车预定时间信息表 · b601a815
  jiaorz authored Jun 20, 2019
  
  b601a815
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · 6838160d
  libin authored Jun 20, 2019
  
  6838160d
- 营地后台接口 · e3fc7154
  libin authored Jun 20, 2019
  
  e3fc7154
- 营地后台接口 · 538cfdd2
  libin authored Jun 20, 2019
  
  538cfdd2
- 修改减库存 · 2729e34e
  hezhen authored Jun 20, 2019
  
  2729e34e
- 修改会员 · 153b3c43
  hezhen authored Jun 20, 2019
  
  153b3c43
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · c98dfa71
  hezhen authored Jun 20, 2019
  
  c98dfa71
- 修改会员 · 7b4ff4b2
  hezhen authored Jun 20, 2019
  
  7b4ff4b2
19 Jun, 2019 12 commits
- 添加会员订单 · f2f8caa3
  周健威 authored Jun 19, 2019
  
  f2f8caa3
- 修改会员 · 184db02f
  hezhen authored Jun 19, 2019
  
  184db02f
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · 8d430582
  hezhen authored Jun 19, 2019
  
  8d430582
- 添加会员模块 · fbcd180f
  hezhen authored Jun 19, 2019
  
  fbcd180f
- Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify · a8a26c90
  jiaorz authored Jun 19, 2019
  
  a8a26c90
- 新增车辆排班列表接口 · fba230f1
  jiaorz authored Jun 19, 2019
  
  fba230f1
- Merge branch 'base-modify' of http://10.5.52.3/youjj/cloud-platform into base-modify · c46c0ad3
  hanfeng authored Jun 19, 2019
  
  c46c0ad3
- 修改车辆信息管理 · 9abbe24e
  hanfeng authored Jun 19, 2019
  
  9abbe24e
- 修改获取用户信息 · 8964e1c4
  hezhen authored Jun 19, 2019
  
  8964e1c4
- 车辆安排接口 · 9a44ae1a
  jiaorz authored Jun 19, 2019
  
  9a44ae1a
- 添加获取会员等级 · b1250388
  hezhen authored Jun 19, 2019
  
  b1250388
- 123 · 1d003293
  hezhen authored Jun 19, 2019
  
  1d003293