Commits · dc9d8f5339ec62b72af7d343efab680ba72ebf23 · youjj / cloud-platform

09 Dec, 2019 28 commits
- Merge branch 'feature-delay-add' into dev · dc9d8f53
  周健威 authored Dec 09, 2019
  
  dc9d8f53
- 修改bug · 61fd79e1
  周健威 authored Dec 09, 2019
  
  61fd79e1
- Merge remote-tracking branch 'origin/dev' into dev · 9f523a71
  周健威 authored Dec 09, 2019
  
  9f523a71
- Merge branch 'feature-delay-add' into dev · d2290c21
  周健威 authored Dec 09, 2019
  
  d2290c21
- Merge remote-tracking branch 'origin/dev' into dev · a037ebf4
  jiaorz authored Dec 09, 2019
  
  a037ebf4
- Merge branch 'feature-delay-add' into dev · 8cac8e89
  jiaorz authored Dec 09, 2019
  
  8cac8e89
- 不计免赔类型 · 922fe6a1
  jiaorz authored Dec 09, 2019
  
  922fe6a1
- Merge branch 'feature-delay-add' into dev · 75e38ead
  周健威 authored Dec 09, 2019
  
  75e38ead
- 修改bug · 20cade21
  周健威 authored Dec 09, 2019
  
  20cade21
- Merge branch 'feature-delay-add' into dev · e5ec4776
  周健威 authored Dec 09, 2019
  
  e5ec4776
- 修改bug · 91906db2
  周健威 authored Dec 09, 2019
  
  91906db2
- Merge remote-tracking branch 'origin/dev' into dev · fbba58c6
  周健威 authored Dec 09, 2019
  
  fbba58c6
- Merge branch 'feature-delay-add' into dev · 95e78cd2
  周健威 authored Dec 09, 2019
  
  95e78cd2
- 修改bug · a8342d73
  周健威 authored Dec 09, 2019
  
  a8342d73
- Merge remote-tracking branch 'origin/dev' into dev · 170a5101
  jiaorz authored Dec 09, 2019
  
  170a5101
- Merge branch 'master-vehicle-count-bug' into dev · 47e7cec2
  jiaorz authored Dec 09, 2019
  
  47e7cec2
- 活动分享修改 · 4c882504
  jiaorz authored Dec 09, 2019
  
  4c882504
- Merge branch 'luck_draw_feature' into dev · 833cefa5
  libin authored Dec 09, 2019
  
  833cefa5
- 抽奖设置校验 · 2a93467a
  libin authored Dec 09, 2019
  
  2a93467a
- Merge remote-tracking branch 'origin/dev' into dev · 5dee7da8
  jiaorz authored Dec 09, 2019
  
  5dee7da8
- Merge branch 'master-vehicle-count-bug' into dev · c3a6049d
  jiaorz authored Dec 09, 2019
  
  c3a6049d
- 活动分享修改 · a20c96b4
  jiaorz authored Dec 09, 2019
  
  a20c96b4
- Merge branch 'feature-delay-add' into dev · 33ce5b6f
  周健威 authored Dec 09, 2019
  
  33ce5b6f
- 修改bug · daf90664
  周健威 authored Dec 09, 2019
  
  daf90664
- Merge remote-tracking branch 'origin/luck_draw_feature' into luck_draw_feature · f3b1eb4a
  libin authored Dec 09, 2019
  
  f3b1eb4a
- Merge branch 'master' into feature-delay-add · d96e6444
  周健威 authored Dec 09, 2019
```
# Conflicts:
#	xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/MsgBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderMsgBiz.java
```
  d96e6444
- Merge remote-tracking branch 'origin/luck_draw_feature' into luck_draw_feature · 294be177
  jiaorz authored Dec 09, 2019
  
  294be177
- 活动分享修改 · 7b1bfeb2
  jiaorz authored Dec 09, 2019
  
  7b1bfeb2
07 Dec, 2019 5 commits
- Merge branch 'luck_draw_feature' into dev · a9e6fa96
  libin authored Dec 07, 2019
  
  a9e6fa96
- 抽奖设置校验 · 3b5b9249
  libin authored Dec 07, 2019
  
  3b5b9249
- Merge branch 'luck_draw_feature' into dev · e44d21da
  libin authored Dec 07, 2019
  
  e44d21da
- 修改车辆统计bug · 182b619f
  jiaorz authored Dec 07, 2019
  
  182b619f
- 抽奖过期时间设置 · f19c10a6
  libin authored Dec 07, 2019
  
  f19c10a6
06 Dec, 2019 6 commits
- 抽奖逻修改 · 6ddd65ec
  libin authored Dec 06, 2019
  
  6ddd65ec
- 修改获取真实还车时间和预约天数 · 1c893bdb
  周健威 authored Dec 06, 2019
  
  1c893bdb
- Merge remote-tracking branch 'origin/feature-delay-add' into feature-delay-add · e817ddfc
  周健威 authored Dec 06, 2019
  
  e817ddfc
- 添加最后的真实还车时间 · cb561a6c
  周健威 authored Dec 06, 2019
  
  cb561a6c
- Merge branch 'luck_draw_feature' into dev · f59a5d7f
  libin authored Dec 06, 2019
  
  f59a5d7f
- 下级查询bug修复 · 3eda9793
  libin authored Dec 06, 2019
  
  3eda9793
05 Dec, 2019 1 commit
- Merge branch 'luck_draw_feature' into dev · ca3c614b
  libin authored Dec 05, 2019
  
  ca3c614b