Commits · adfbd26c0690fecc889f77442348f0a8cd23ac1c · youjj / cloud-platform

04 Nov, 2020 19 commits
- 修改流程 · adfbd26c
  周健威 authored Nov 04, 2020
  
  adfbd26c
- 修改流程 · 34686f45
  周健威 authored Nov 04, 2020
  
  34686f45
- Merge remote-tracking branch 'origin/dev-chw' into dev-chw · 889d3efe
  周健威 authored Nov 04, 2020
  
  889d3efe
- 修改流程 · 707879fe
  周健威 authored Nov 04, 2020
  
  707879fe
- 123 · 515e49d5
  hezhen authored Nov 04, 2020
  
  515e49d5
- 123 · 7e11182e
  hezhen authored Nov 04, 2020
  
  7e11182e
- 123 · dbe4351d
  hezhen authored Nov 04, 2020
  
  dbe4351d
- 123 · b952fb3a
  hezhen authored Nov 04, 2020
  
  b952fb3a
- Merge branch 'dev-chw' of http://113.105.137.151:22280/youjj/cloud-platform into dev-chw · 846e0c12
  hezhen authored Nov 04, 2020
  
  846e0c12
- 123 · 727e682f
  hezhen authored Nov 04, 2020
  
  727e682f
- 修改下单流程 · 421b2809
  周健威 authored Nov 04, 2020
  
  421b2809
- Merge remote-tracking branch 'origin/dev-chw' into dev-chw · ff4ea3b1
  周健威 authored Nov 04, 2020
  
  ff4ea3b1
- 修改租车流程 · b8c20be5
  周健威 authored Nov 04, 2020
  
  b8c20be5
- 123 · ac623f80
  hezhen authored Nov 04, 2020
  
  ac623f80
- 123 · c4e3f6f9
  hezhen authored Nov 04, 2020
  
  c4e3f6f9
- 123 · 3706a6e5
  hezhen authored Nov 04, 2020
  
  3706a6e5
- 123 · 24eea324
  hezhen authored Nov 04, 2020
  
  24eea324
- Merge branch 'dev-chw' of http://113.105.137.151:22280/youjj/cloud-platform into dev-chw · 5a5b0351
  hezhen authored Nov 04, 2020
  
  5a5b0351
- 123 · b76458de
  hezhen authored Nov 04, 2020
  
  b76458de
03 Nov, 2020 21 commits
- Merge remote-tracking branch 'origin/dev-chw' into dev-chw · 2fd68774
  周健威 authored Nov 03, 2020
  
  2fd68774
- 添加特惠租车定时 · f183208d
  周健威 authored Nov 03, 2020
  
  f183208d
- Merge branch 'dev-chw' of http://113.105.137.151:22280/youjj/cloud-platform into dev-chw · e15464af
  hezhen authored Nov 03, 2020
  
  e15464af
- 123 · 2bcfe3fb
  hezhen authored Nov 03, 2020
  
  2bcfe3fb
- 添加特惠租车定时 · 39b9c460
  周健威 authored Nov 03, 2020
  
  39b9c460
- Merge remote-tracking branch 'origin/dev-chw' into dev-chw · 0c3cc636
  周健威 authored Nov 03, 2020
  
  0c3cc636
- 添加特惠租车定时 · 24c90ef7
  周健威 authored Nov 03, 2020
  
  24c90ef7
- 123 · 71458adf
  hezhen authored Nov 03, 2020
  
  71458adf
- 123 · 544791f3
  hezhen authored Nov 03, 2020
  
  544791f3
- Merge remote-tracking branch 'origin/dev-chw' into dev-chw · d2f0f326
  周健威 authored Nov 03, 2020
  
  d2f0f326
- 添加特惠租车 · 422256d0
  周健威 authored Nov 03, 2020
  
  422256d0
- Merge branch 'dev-chw' of http://113.105.137.151:22280/youjj/cloud-platform into dev-chw · 6274d700
  hezhen authored Nov 03, 2020
  
  6274d700
- 123 · 0fac62c1
  hezhen authored Nov 03, 2020
  
  0fac62c1
- 添加特惠租车 · c99f8d0b
  周健威 authored Nov 03, 2020
  
  c99f8d0b
- 添加特惠租车 · 8c7993f4
  周健威 authored Nov 03, 2020
  
  8c7993f4
- Merge remote-tracking branch 'origin/dev-chw' into dev-chw · df8ba7f9
  周健威 authored Nov 03, 2020
  
  df8ba7f9
- 添加代码 · a36c4671
  周健威 authored Nov 03, 2020
  
  a36c4671
- 添加代码 · 4d214ba6
  周健威 authored Nov 03, 2020
  
  4d214ba6
- 添加上下架设置 · 604807fb
  hezhen authored Nov 03, 2020
  
  604807fb
- Merge branch 'dev-chw' of http://113.105.137.151:22280/youjj/cloud-platform into dev-chw · 9e982ec9
  hezhen authored Nov 03, 2020
```
# Conflicts:
#	xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/feign/OrderFeign.java
```
  9e982ec9
- 123 · bddd54ce
  hezhen authored Nov 03, 2020
  
  bddd54ce