Commits · cd3ccd6321a0a1973bdf4aaa7fe128bba28d382a · youjj / cloud-platform

05 Dec, 2019 6 commits
- Merge branch 'master-new-activity' into dev · cd3ccd63
  jiaorz authored Dec 05, 2019
  
  cd3ccd63
- 活动修改 · be9da4ac
  jiaorz authored Dec 05, 2019
  
  be9da4ac
- Merge branch 'master-new-activity' into dev · 42970177
  jiaorz authored Dec 05, 2019
  
  42970177
- 活动修改 · 99bd07d7
  jiaorz authored Dec 05, 2019
  
  99bd07d7
- Merge branch 'master-new-activity' into dev · df708891
  jiaorz authored Dec 05, 2019
  
  df708891
- 活动修改 · 9a1e3381
  jiaorz authored Dec 05, 2019
  
  9a1e3381
04 Dec, 2019 34 commits
- Merge branch 'feature-delay-add' into dev · 8ae91549
  周健威 authored Dec 04, 2019
  
  8ae91549
- 修改计价bug · 54d05524
  周健威 authored Dec 04, 2019
  
  54d05524
- Merge branch 'feature-delay-add' into dev · d63c2ba8
  周健威 authored Dec 04, 2019
  
  d63c2ba8
- Merge remote-tracking branch 'origin/dev' into dev · 1b022904
  周健威 authored Dec 04, 2019
  
  1b022904
- Merge branch 'master' into dev · 605ed6d0
  周健威 authored Dec 04, 2019
  
  605ed6d0
- Merge branch 'master-vedio-list' · 21ff9ff5
  周健威 authored Dec 04, 2019
  
  21ff9ff5
- 修改计价bug · ce8e6f63
  周健威 authored Dec 04, 2019
  
  ce8e6f63
- Merge branch 'master-new-activity' into dev · cc8fc402
  jiaorz authored Dec 04, 2019
  
  cc8fc402
- 活动修改 · 3d89d275
  jiaorz authored Dec 04, 2019
  
  3d89d275
- Merge branch 'feature-delay-add' into dev · 02a0acbe
  周健威 authored Dec 04, 2019
  
  02a0acbe
- Merge remote-tracking branch 'origin/dev' into dev · 63502aa7
  jiaorz authored Dec 04, 2019
  
  63502aa7
- Merge branch 'master-new-activity' into dev · 6631750f
  jiaorz authored Dec 04, 2019
  
  6631750f
- 活动修改 · 0141048b
  jiaorz authored Dec 04, 2019
  
  0141048b
- Merge remote-tracking branch 'origin/feature-delay-add' into feature-delay-add · 66473170
  周健威 authored Dec 04, 2019
  
  66473170
- 修改bug · 3525dcba
  周健威 authored Dec 04, 2019
  
  3525dcba
- Merge branch 'feature-delay-add' into dev · 336bdd96
  jiaorz authored Dec 04, 2019
  
  336bdd96
- 延长还车订单详情 · 87180832
  jiaorz authored Dec 04, 2019
  
  87180832
- Merge branch 'feature-delay-add' into dev · 1d9b37c5
  jiaorz authored Dec 04, 2019
```
# Conflicts:
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java
```
  1d9b37c5
- 延长还车订单详情 · 88d0c70c
  jiaorz authored Dec 04, 2019
  
  88d0c70c
- 获取用户活动列表 · 02eff0b9
  jiaorz authored Dec 04, 2019
  
  02eff0b9
- 延长还车字段bug · 9504a652
  jiaorz authored Dec 04, 2019
  
  9504a652
- Merge branch 'feature-delay-add' into dev · ecb62992
  jiaorz authored Dec 04, 2019
  
  ecb62992
- 延长还车字段bug · 359b9d76
  jiaorz authored Dec 04, 2019
  
  359b9d76
- Merge branch 'master-new-activity' into dev · d26b6b05
  jiaorz authored Dec 04, 2019
  
  d26b6b05
- Merge branch 'feature-delay-add' into dev · 59a906d0
  jiaorz authored Dec 04, 2019
  
  59a906d0
- 获取用户奖励列表 · 674d9102
  jiaorz authored Dec 04, 2019
  
  674d9102
- 获取用户奖励列表 · 83b2cde0
  jiaorz authored Dec 04, 2019
  
  83b2cde0
- Merge branch 'master-new-activity' into dev · 0c6f63e4
  jiaorz authored Dec 04, 2019
  
  0c6f63e4
- 获取用户奖励列表 · 7e1a7b34
  jiaorz authored Dec 04, 2019
  
  7e1a7b34
- Merge branch 'master-new-activity' into dev · bb3a9705
  jiaorz authored Dec 04, 2019
  
  bb3a9705
- 获取用户奖励列表 · 9b8bc14e
  jiaorz authored Dec 04, 2019
  
  9b8bc14e
- Merge branch 'master-new-activity' into dev · df8945b2
  jiaorz authored Dec 04, 2019
  
  df8945b2
- 获取用户奖励列表 · 9c265d24
  jiaorz authored Dec 04, 2019
  
  9c265d24
- Merge branch 'master-new-activity' into dev · 12e1fab7
  jiaorz authored Dec 04, 2019
  
  12e1fab7