Commits · 22dcc8db6a4bb94db5c520b9fbb9ba486e5dd521 · youjj / cloud-platform

10 Dec, 2019 9 commits
- Merge remote-tracking branch 'origin/dev' into dev · 22dcc8db
  周健威 authored Dec 10, 2019
  
  22dcc8db
- Merge branch 'feature-delay-add' into dev · 7faa6cc8
  周健威 authored Dec 10, 2019
  
  7faa6cc8
- 修改bug · 689744c3
  周健威 authored Dec 10, 2019
  
  689744c3
- Merge branch 'luck_draw_feature' into dev · 78bdebb8
  libin authored Dec 10, 2019
  
  78bdebb8
- 抽奖设置 · fa13c379
  libin authored Dec 10, 2019
  
  fa13c379
- Merge branch 'luck_draw_feature' into dev · 319aae48
  libin authored Dec 10, 2019
  
  319aae48
- 抽奖设置 · 24ca3a24
  libin authored Dec 10, 2019
  
  24ca3a24
- Merge branch 'master_activity' into dev · c0f96abb
  hezhen authored Dec 10, 2019
  
  c0f96abb
- 添加直播地址 · 354b8007
  hezhen authored Dec 10, 2019
  
  354b8007
09 Dec, 2019 31 commits
- Merge remote-tracking branch 'origin/dev' into dev · 18d056ea
  周健威 authored Dec 09, 2019
  
  18d056ea
- 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 · 8f5148bc
  jiaorz authored Dec 09, 2019
  
  8f5148bc
- Merge branch 'luck_draw_feature' into dev · 946d1a70
  jiaorz authored Dec 09, 2019
  
  946d1a70
- Merge remote-tracking branch 'origin/luck_draw_feature' into luck_draw_feature · c4499b84
  jiaorz authored Dec 09, 2019
  
  c4499b84
- 活动排序 · ae0762da
  jiaorz authored Dec 09, 2019
  
  ae0762da
- 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