Commits · b2a0976d91972162e6d95db5b575d6a27f8e0697 · youjj / cloud-platform

12 Dec, 2019 7 commits
- Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev · b2a0976d
  hezhen authored Dec 12, 2019
  
  b2a0976d
- 123 · 2cbbf54d
  hezhen authored Dec 12, 2019
  
  2cbbf54d
- Merge branch 'master-vehicle-count-bug' into dev · 419ba1c3
  jiaorz authored Dec 12, 2019
  
  419ba1c3
- 1 · f2238eec
  jiaorz authored Dec 12, 2019
  
  f2238eec
- Merge remote-tracking branch 'origin/dev' into dev · 7d0f5d48
  jiaorz authored Dec 12, 2019
  
  7d0f5d48
- Merge branch 'luck_draw_feature' into dev · 2dd553e9
  jiaorz authored Dec 12, 2019
  
  2dd553e9
- 获取用户是否参加活动 · 2379cd6d
  jiaorz authored Dec 12, 2019
  
  2379cd6d
11 Dec, 2019 33 commits
- Merge remote-tracking branch 'origin/dev' into dev · 0049ace0
  libin authored Dec 11, 2019
  
  0049ace0
- 数据清除 · 0382b81a
  libin authored Dec 11, 2019
  
  0382b81a
- Merge remote-tracking branch 'origin/dev' into dev · dbdbe1bb
  周健威 authored Dec 11, 2019
  
  dbdbe1bb
- Merge branch 'master-zjw' into dev · 9b6b6c8b
  周健威 authored Dec 11, 2019
  
  9b6b6c8b
- 修改bug · 280f53ed
  周健威 authored Dec 11, 2019
  
  280f53ed
- Merge branch 'luck_draw_feature' into dev · d135e977
  jiaorz authored Dec 11, 2019
  
  d135e977
- 修改bug · d1c6b6b7
  周健威 authored Dec 11, 2019
  
  d1c6b6b7
- 获取用户是否参加活动 · 5c3bb949
  jiaorz authored Dec 11, 2019
  
  5c3bb949
- 获取用户是否参加活动 · adfca6dc
  jiaorz authored Dec 11, 2019
  
  adfca6dc
- Merge branch 'master' into master-zjw · d6059745
  周健威 authored Dec 11, 2019
  
  d6059745
- Merge branch 'luck_draw_feature' into dev · 444d3278
  jiaorz authored Dec 11, 2019
  
  444d3278
- 获取用户是否参加活动 · 0ff83005
  jiaorz authored Dec 11, 2019
  
  0ff83005
- Merge branch 'luck_draw_feature' into dev · 6a179605
  jiaorz authored Dec 11, 2019
```
# Conflicts:
#	xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/ActivityPopularizeRelationBiz.java
```
  6a179605
- 获取用户是否参加活动 · 1ddb2d41
  jiaorz authored Dec 11, 2019
  
  1ddb2d41
- 获取用户是否参加活动 · 7bda5531
  jiaorz authored Dec 11, 2019
  
  7bda5531
- 获取用户是否参加活动 · 57951bab
  jiaorz authored Dec 11, 2019
  
  57951bab
- 获取用户是否参加活动 · cc37acac
  jiaorz authored Dec 11, 2019
  
  cc37acac
- 获取用户是否参加活动 · 7c3925ec
  jiaorz authored Dec 11, 2019
  
  7c3925ec
- 获取用户是否参加活动 · 90f0fc5d
  jiaorz authored Dec 11, 2019
  
  90f0fc5d
- 获取用户是否参加活动 · 01476097
  jiaorz authored Dec 11, 2019
  
  01476097
- Merge remote-tracking branch 'origin/dev' into dev · da90114d
  jiaorz authored Dec 11, 2019
  
  da90114d
- 获取用户是否参加活动 · 2263aee2
  jiaorz authored Dec 11, 2019
  
  2263aee2
- Merge branch 'feature-delay-add' into dev · 64eef2b2
  周健威 authored Dec 11, 2019
  
  64eef2b2
- 修改bug · 01fa0357
  周健威 authored Dec 11, 2019
  
  01fa0357
- Merge remote-tracking branch 'origin/dev' into dev · 52ecdd3d
  周健威 authored Dec 11, 2019
  
  52ecdd3d
- Merge branch 'feature-delay-add' into dev · a70dc00b
  周健威 authored Dec 11, 2019
  
  a70dc00b
- 修改bug · 5ed379c1
  周健威 authored Dec 11, 2019
  
  5ed379c1
- Merge remote-tracking branch 'origin/dev' into dev · 46c6d9ad
  jiaorz authored Dec 11, 2019
  
  46c6d9ad
- Merge branch 'luck_draw_feature' into dev · 8836911b
  jiaorz authored Dec 11, 2019
  
  8836911b
- Merge branch 'feature-delay-add' into dev · 90fa683f
  周健威 authored Dec 11, 2019
  
  90fa683f
- 修改bug · 38ab6d81
  周健威 authored Dec 11, 2019
  
  38ab6d81
- Merge branch 'luck_draw_feature' into dev · 36f04349
  libin authored Dec 11, 2019
  
  36f04349
- 抽奖活动弹窗修改 · 5d1428e7
  libin authored Dec 11, 2019
  
  5d1428e7