Commits · bc68e92faf3c2047f3096cefa4d237e79732589f · youjj / cloud-platform

20 Nov, 2020 37 commits
- Merge branch 'master-chw' into dev-chw · bc68e92f
  hezhen authored Nov 20, 2020
  
  bc68e92f
- 123 · 33c6b4bf
  hezhen authored Nov 20, 2020
  
  33c6b4bf
- Merge branch 'dev-chw' of http://113.105.137.151:22280/youjj/cloud-platform into dev-chw · a8447953
  hezhen authored Nov 20, 2020
  
  a8447953
- Merge branch 'master-chw' into dev-chw · dcf88cb7
  hezhen authored Nov 20, 2020
  
  dcf88cb7
- 123 · 40c7985f
  hezhen authored Nov 20, 2020
  
  40c7985f
- Merge branch 'dev-chw-vehicle' into dev-chw · e37774d0
  unset authored Nov 20, 2020
  
  e37774d0
- 新增违章查询接口 · 4e3c98e6
  unset authored Nov 20, 2020
  
  4e3c98e6
- Merge branch 'dev-chw' of http://113.105.137.151:22280/youjj/cloud-platform into dev-chw · 13c92001
  hezhen authored Nov 20, 2020
  
  13c92001
- Merge branch 'master-chw' into dev-chw · 72e731d9
  hezhen authored Nov 20, 2020
  
  72e731d9
- 123 · 08f7c785
  hezhen authored Nov 20, 2020
  
  08f7c785
- 修改活动 · 9b8202eb
  hezhen authored Nov 20, 2020
  
  9b8202eb
- Merge branch 'dev-chw-vehicle' into dev-chw · 7145bed3
  unset authored Nov 20, 2020
  
  7145bed3
- 新增违章查询接口 · cab41080
  unset authored Nov 20, 2020
  
  cab41080
- Merge branch 'dev-chw-vehicle' into dev-chw · 7eb166c9
  unset authored Nov 20, 2020
  
  7eb166c9
- 新增违章查询接口 · e458606c
  unset authored Nov 20, 2020
  
  e458606c
- Merge branch 'master_chw_publish' into dev-chw · 7837591c
  hezhen authored Nov 20, 2020
  
  7837591c
- 123 · 903c4c22
  hezhen authored Nov 20, 2020
  
  903c4c22
- Merge branch 'dev-chw' of http://113.105.137.151:22280/youjj/cloud-platform into dev-chw · 045118e6
  hezhen authored Nov 20, 2020
  
  045118e6
- Merge branch 'master_chw_publish' into dev-chw · 8f1527ba
  hezhen authored Nov 20, 2020
  
  8f1527ba
- 123 · 2fb9e4b7
  hezhen authored Nov 20, 2020
  
  2fb9e4b7
- Merge branch 'dev-chw-vehicle' into dev-chw · ed312e22
  unset authored Nov 20, 2020
  
  ed312e22
- 新增违章查询接口 · 4f9620d1
  unset authored Nov 20, 2020
  
  4f9620d1
- Merge branch 'dev-chw-vehicle' into dev-chw · fdd597d1
  unset authored Nov 20, 2020
  
  fdd597d1
- 新增违章查询接口 · 6b82b4d8
  unset authored Nov 20, 2020
  
  6b82b4d8
- Merge branch 'dev-chw-wwz' into dev-chw · 41369181
  wuwz authored Nov 20, 2020
  
  41369181
- 修改評價bug · f80060d7
  wuwz authored Nov 20, 2020
  
  f80060d7
- Merge branch 'dev-chw-vehicle' into dev-chw · c2984327
  unset authored Nov 20, 2020
  
  c2984327
- 新增违章查询接口 · cf65584d
  unset authored Nov 20, 2020
  
  cf65584d
- Merge branch 'dev-chw-wwz' into dev-chw · 9c36f091
  wuwz authored Nov 20, 2020
  
  9c36f091
- 修改baseorder · f6db0265
  wuwz authored Nov 20, 2020
  
  f6db0265
- Merge branch 'dev-chw-wwz' into dev-chw · c8c1b19c
  wuwz authored Nov 20, 2020
  
  c8c1b19c
- 注入orderFeign · a0d734e2
  wuwz authored Nov 20, 2020
  
  a0d734e2
- Merge remote-tracking branch 'origin/dev-chw' into dev-chw · e79c5b33
  wuwz authored Nov 20, 2020
  
  e79c5b33
- 增加订单判断是否评论 · 11601461
  wuwz authored Nov 20, 2020
  
  11601461
- 123 · 50d4be8a
  hezhen authored Nov 20, 2020
  
  50d4be8a
- Merge branch 'master_chw_publish' into dev-chw · fb960a0a
  hezhen authored Nov 20, 2020
  
  fb960a0a
- 修改 · 118361d8
  hezhen authored Nov 20, 2020
  
  118361d8
19 Nov, 2020 3 commits
- Merge branch 'feature_chw_zjw' into dev-chw · 831f9be5
  周健威 authored Nov 19, 2020
```
# Conflicts:
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/SpecialRentController.java
```
  831f9be5
- 添加详情 · 43b5af84
  周健威 authored Nov 19, 2020
  
  43b5af84
- 添加详情 · 4f0b60e8
  周健威 authored Nov 19, 2020
  
  4f0b60e8