Commits · 4e8966b8bc1f6f44f8ec38fa030de43b1142ed4d · youjj / cloud-platform

18 Oct, 2019 8 commits
- Merge branch 'holiday-price' into dev · 4e8966b8
  周健威 authored Oct 18, 2019
```
# Conflicts:
#	xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java
```
  4e8966b8
- 修改代码 · adac92e4
  周健威 authored Oct 18, 2019
  
  adac92e4
- Merge branch 'master' into holiday-price · 134c4296
  周健威 authored Oct 18, 2019
  
  134c4296
- 修改代码 · d0151b8f
  周健威 authored Oct 18, 2019
  
  d0151b8f
- Merge remote-tracking branch 'origin/holiday-price' into holiday-price · afb68825
  周健威 authored Oct 18, 2019
  
  afb68825
- 修改代码 · 5d37e499
  周健威 authored Oct 18, 2019
  
  5d37e499
- 车型日历价格 · c614865b
  libin authored Oct 18, 2019
  
  c614865b
- 修改代码 · f6964eb5
  周健威 authored Oct 18, 2019
  
  f6964eb5
17 Oct, 2019 32 commits
- 添加车架号和发动机号唯一验证 · 4f687b97
  jiaorz authored Oct 17, 2019
  
  4f687b97
- Merge remote-tracking branch 'origin/dev' into dev · 65c90f03
  周健威 authored Oct 17, 2019
  
  65c90f03
- Merge branch 'master-zjw' into dev · 19fae4cb
  周健威 authored Oct 17, 2019
  
  19fae4cb
- Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev · 563533e6
  hezhen authored Oct 17, 2019
  
  563533e6
- Merge branch 'hz_master' into dev · 1e3de37e
  hezhen authored Oct 17, 2019
  
  1e3de37e
- 促成人查询用户id · 2c84d529
  周健威 authored Oct 17, 2019
  
  2c84d529
- 123 · 4f0003d3
  hezhen authored Oct 17, 2019
  
  4f0003d3
- Merge remote-tracking branch 'origin/dev' into dev · e5e30a7f
  周健威 authored Oct 17, 2019
  
  e5e30a7f
- Merge branch 'master-zjw' into dev · 7c722bba
  周健威 authored Oct 17, 2019
  
  7c722bba
- 添加检索账单时，判断状态为真 · f61d2b20
  周健威 authored Oct 17, 2019
  
  f61d2b20
- Merge branch 'hz_master' into dev · 3009349a
  hezhen authored Oct 17, 2019
  
  3009349a
- 123 · bc40ec79
  hezhen authored Oct 17, 2019
  
  bc40ec79
- 会员等级 · 480e7435
  libin authored Oct 17, 2019
  
  480e7435
- Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev · 735761f9
  hezhen authored Oct 17, 2019
  
  735761f9
- Merge branch 'hz_master' into dev · f15c6321
  hezhen authored Oct 17, 2019
  
  f15c6321
- 123 · 59eb4ae5
  hezhen authored Oct 17, 2019
  
  59eb4ae5
- Merge branch 'master-bug-hf' into dev · 501823c5
  hanfeng authored Oct 17, 2019
  
  501823c5
- 修改官网新闻和旅游 · 6384f4bf
  hanfeng authored Oct 17, 2019
  
  6384f4bf
- Merge remote-tracking branch 'origin/master' into master-ucc-feature · 8adf75bb
  libin authored Oct 17, 2019
  
  8adf75bb
- Merge remote-tracking branch 'origin/dev' into dev · e070eb4b
  libin authored Oct 17, 2019
  
  e070eb4b
- Merge branch 'master-ucc-feature' into dev · c553ae1d
  libin authored Oct 17, 2019
  
  c553ae1d
- 会员等级 · 8daac259
  libin authored Oct 17, 2019
  
  8daac259
- 日历价格 · 6d78d0f3
  libin authored Oct 17, 2019
  
  6d78d0f3
- Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev · 85528c08
  hezhen authored Oct 17, 2019
  
  85528c08
- Merge branch 'hz_master' into dev · f89709a5
  hezhen authored Oct 17, 2019
  
  f89709a5
- 123 · 0e718bfe
  hezhen authored Oct 17, 2019
  
  0e718bfe
- Merge remote-tracking branch 'origin/dev' into dev · 89f46b71
  周健威 authored Oct 17, 2019
  
  89f46b71
- Merge branch 'master' into dev · ce2bd0c5
  周健威 authored Oct 17, 2019
  
  ce2bd0c5
- 修复后台下单只能下可租赁的车 · db568e9e
  周健威 authored Oct 17, 2019
  
  db568e9e
- Merge remote-tracking branch 'origin/dev' into dev · 15410b77
  libin authored Oct 17, 2019
  
  15410b77
- Merge branch 'master-auto-pay' into dev · 08383628
  libin authored Oct 17, 2019
  
  08383628
- 提现 · 65b26cd0
  libin authored Oct 17, 2019
  
  65b26cd0