Commits · 95e78cd26d60bb35a7d2c0cc8e967e828be444c1 · youjj / cloud-platform

09 Dec, 2019 5 commits
- Merge branch 'feature-delay-add' into dev · 95e78cd2
  周健威 authored Dec 09, 2019
  
  95e78cd2
- 修改bug · a8342d73
  周健威 authored Dec 09, 2019
  
  a8342d73
- Merge branch 'feature-delay-add' into dev · 33ce5b6f
  周健威 authored Dec 09, 2019
  
  33ce5b6f
- 修改bug · daf90664
  周健威 authored Dec 09, 2019
  
  daf90664
- 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
07 Dec, 2019 4 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
- 抽奖过期时间设置 · 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 25 commits
- Merge branch 'luck_draw_feature' into dev · ca3c614b
  libin authored Dec 05, 2019
  
  ca3c614b
- Merge branch 'order_received_statistics' into dev · ac1cca40
  libin authored Dec 05, 2019
  
  ac1cca40
- Merge remote-tracking branch 'origin/dev' into dev · 06460f19
  libin authored Dec 05, 2019
  
  06460f19
- Merge branch 'dev' of E:\code_space\cloud-platform with conflicts. · 97726b5a
  libin authored Dec 05, 2019
  
  97726b5a
- 推广码查询用户信息 · f3b6d7d8
  libin authored Dec 05, 2019
  
  f3b6d7d8
- 抽奖 · 0ace76c0
  libin authored Dec 05, 2019
  
  0ace76c0
- Merge remote-tracking branch 'origin/feature-delay-add' into feature-delay-add · aedd5f28
  libin authored Dec 05, 2019
  
  aedd5f28
- 日历价格 · 777d6c41
  libin authored Dec 05, 2019
  
  777d6c41
- 抽奖 · dd089133
  libin authored Dec 05, 2019
  
  dd089133
- Merge branch 'feature-delay-add' into dev · 56b07609
  周健威 authored Dec 05, 2019
  
  56b07609
- 修改延长还车bug · e0acbc00
  周健威 authored Dec 05, 2019
  
  e0acbc00
- Merge remote-tracking branch 'origin/luck_draw_feature' into luck_draw_feature · ceaef0ef
  libin authored Dec 05, 2019
  
  ceaef0ef
- 抽奖实体相关创建 · 286e2694
  libin authored Dec 05, 2019
  
  286e2694
- Merge branch 'master-zjw' into dev · a9facd6a
  周健威 authored Dec 05, 2019
  
  a9facd6a
- 修改违章保证金提前退 · 99936fa2
  周健威 authored Dec 05, 2019
  
  99936fa2
- Merge branch 'master-new-activity' into luck_draw_feature · 89d808a7
  jiaorz authored Dec 05, 2019
  
  89d808a7
- Merge branch 'master-new-activity' into dev · bda1fa09
  jiaorz authored Dec 05, 2019
  
  bda1fa09
- 活动修改 · c46c5a69
  jiaorz authored Dec 05, 2019
  
  c46c5a69
- Merge branch 'master-new-activity' into dev · 2d2590be
  jiaorz authored Dec 05, 2019
  
  2d2590be
- 活动修改 · e27f3756
  jiaorz authored Dec 05, 2019
  
  e27f3756
- Merge remote-tracking branch 'origin/dev' into dev · 998797c5
  jiaorz authored Dec 05, 2019
  
  998797c5
- Merge branch 'master-new-activity' into dev · cd3ccd63
  jiaorz authored Dec 05, 2019
  
  cd3ccd63
- Merge branch 'feature-delay-add' into dev · 5b32f880
  周健威 authored Dec 05, 2019
  
  5b32f880
- 活动修改 · be9da4ac
  jiaorz authored Dec 05, 2019
  
  be9da4ac
- 修改提前还车 bug · f18b3ce1
  周健威 authored Dec 05, 2019
  
  f18b3ce1