Commits · e15464afa0c5887627313492eba789d669708efe · youjj / cloud-platform

03 Nov, 2020 19 commits
- 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
02 Nov, 2020 19 commits
- Merge remote-tracking branch 'origin/dev-chw' into dev-chw · f991582a
  周健威 authored Nov 02, 2020
  
  f991582a
- 添加代码 · 568a1155
  周健威 authored Nov 02, 2020
  
  568a1155
- 修改分账 · f194dfcb
  hezhen authored Nov 02, 2020
  
  f194dfcb
- 订单核销接口修改 · e99d6133
  unset authored Nov 02, 2020
  
  e99d6133
- 订单核销接口修改 · c7223395
  unset authored Nov 02, 2020
  
  c7223395
- 订单核销接口修改 · 5d7191b2
  unset authored Nov 02, 2020
  
  5d7191b2
- 订单核销接口修改 · d2061861
  unset authored Nov 02, 2020
  
  d2061861
- 订单核销接口修改 · 554587d4
  unset authored Nov 02, 2020
  
  554587d4
- Merge branch 'dev-chw-vehicle' into dev-chw · da9237fb
  unset authored Nov 02, 2020
  
  da9237fb
- 订单核销接口修改 · 3c6a9a3f
  unset authored Nov 02, 2020
  
  3c6a9a3f
- Merge remote-tracking branch 'origin/dev-chw' into dev-chw · 01acf57e
  unset authored Nov 02, 2020
  
  01acf57e
- 订单核销接口修改 · aa695842
  unset authored Nov 02, 2020
  
  aa695842
- 添加代码 · adf59238
  周健威 authored Nov 02, 2020
  
  adf59238
- 添加代码 · a6774a43
  周健威 authored Nov 02, 2020
  
  a6774a43
- Merge remote-tracking branch 'origin/dev-chw' into dev-chw · e23ab490
  周健威 authored Nov 02, 2020
  
  e23ab490
- 添加代码 · 0b0882ef
  周健威 authored Nov 02, 2020
  
  0b0882ef
- Merge branch 'dev-chw' of http://113.105.137.151:22280/youjj/cloud-platform into dev-chw · ed08c194
  hezhen authored Nov 02, 2020
  
  ed08c194
- 123 · 99b3c6a9
  hezhen authored Nov 02, 2020
  
  99b3c6a9
- 订单核销接口修改 · 01f42db2
  unset authored Nov 02, 2020
  
  01f42db2
31 Oct, 2020 2 commits
- 123 · ad067d0a
  hezhen authored Oct 31, 2020
  
  ad067d0a
- 123 · fec5ddec
  hezhen authored Oct 31, 2020
  
  fec5ddec