Commits · a4373f02d314b1772313be94ca8bb543253b0bdc · youjj / cloud-platform

11 Dec, 2019 15 commits
- Merge branch 'luck_draw_feature' into dev · a4373f02
  libin authored Dec 11, 2019
  
  a4373f02
- 抽奖活动弹窗修改 · fb214741
  libin authored Dec 11, 2019
  
  fb214741
- Merge remote-tracking branch 'origin/luck_draw_feature' into luck_draw_feature · a1f29bf8
  libin authored Dec 11, 2019
  
  a1f29bf8
- 获取用户是否参加活动 · 772e10fb
  jiaorz authored Dec 11, 2019
  
  772e10fb
- Merge remote-tracking branch 'origin/luck_draw_feature' into luck_draw_feature · 40fb68a7
  libin authored Dec 11, 2019
  
  40fb68a7
- 获取用户是否参加活动 · a1903fc9
  jiaorz authored Dec 11, 2019
  
  a1903fc9
- 获取用户是否参加活动 · 3ad83ec2
  jiaorz authored Dec 11, 2019
  
  3ad83ec2
- Merge branch 'feature-delay-add' into dev · 2b0f6481
  周健威 authored Dec 11, 2019
  
  2b0f6481
- 修改bug · 09fc4d00
  周健威 authored Dec 11, 2019
  
  09fc4d00
- Merge branch 'feature-delay-add' into dev · f434c4da
  周健威 authored Dec 11, 2019
  
  f434c4da
- 修改bug · 6fac51ea
  周健威 authored Dec 11, 2019
  
  6fac51ea
- Merge branch 'feature-delay-add' into dev · 3ade5a6b
  周健威 authored Dec 11, 2019
  
  3ade5a6b
- 修改bug · 73681825
  周健威 authored Dec 11, 2019
  
  73681825
- 修改结束时间 · 1098f123
  周健威 authored Dec 11, 2019
  
  1098f123
- Merge remote-tracking branch 'origin/luck_draw_feature' into luck_draw_feature · e6963bbe
  libin authored Dec 11, 2019
  
  e6963bbe
10 Dec, 2019 25 commits
- Merge remote-tracking branch 'origin/dev' into dev · f1323606
  周健威 authored Dec 10, 2019
  
  f1323606
- Merge branch 'feature-delay-add' into dev · 12c1e772
  周健威 authored Dec 10, 2019
  
  12c1e772
- 修改结束时间 · bef46fb4
  周健威 authored Dec 10, 2019
  
  bef46fb4
- Merge remote-tracking branch 'origin/dev' into dev · 340f5456
  hanfeng authored Dec 10, 2019
  
  340f5456
- Merge branch 'master-bug-vehiclemodel-hf' into dev · 0ce196e1
  hanfeng authored Dec 10, 2019
  
  0ce196e1
- 修改车辆 · 2b9bf66e
  hanfeng authored Dec 10, 2019
  
  2b9bf66e
- Merge remote-tracking branch 'origin/dev' into dev · bdc1737a
  jiaorz authored Dec 10, 2019
  
  bdc1737a
- Merge branch 'master-im-list' into dev · 028654f7
  jiaorz authored Dec 10, 2019
  
  028654f7
- 修改消息类型 · 432c9e4a
  jiaorz authored Dec 10, 2019
  
  432c9e4a
- 修改车辆 · d26e8306
  hanfeng authored Dec 10, 2019
  
  d26e8306
- Merge remote-tracking branch 'origin/dev' into dev · 3a4ec57e
  周健威 authored Dec 10, 2019
  
  3a4ec57e
- Merge branch 'feature-delay-add' into dev · 4f331175
  周健威 authored Dec 10, 2019
  
  4f331175
- 修改bug · f1ea893a
  周健威 authored Dec 10, 2019
  
  f1ea893a
- Merge branch 'master' into dev · abb24719
  hanfeng authored Dec 10, 2019
  
  abb24719
- 峰会,与会人员临时记录接口 · eda33414
  hanfeng authored Dec 10, 2019
  
  eda33414
- Merge branch 'feature-delay-add' into dev · b8a27e02
  周健威 authored Dec 10, 2019
  
  b8a27e02
- 修改bug · 8650dbf5
  周健威 authored Dec 10, 2019
  
  8650dbf5
- Merge branch 'feature-delay-add' into dev · dfc1faf6
  周健威 authored Dec 10, 2019
  
  dfc1faf6
- 修改bug · 8ba207e8
  周健威 authored Dec 10, 2019
  
  8ba207e8
- Merge branch 'master' into dev · b37e2aaa
  hanfeng authored Dec 10, 2019
  
  b37e2aaa
- 峰会,与会人员临时记录接口 · 6947c7bd
  hanfeng authored Dec 10, 2019
  
  6947c7bd
- Merge branch 'master' into dev · 7277b661
  hanfeng authored Dec 10, 2019
```
# Conflicts:
#	xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/UploadService.java
```
  7277b661
- 峰会,与会人员临时记录接口 · a15d638c
  hanfeng authored Dec 10, 2019
  
  a15d638c
- Merge branch 'feature-delay-add' into dev · e7124fb1
  周健威 authored Dec 10, 2019
  
  e7124fb1
- 修改bug · 3e60dad6
  周健威 authored Dec 10, 2019
  
  3e60dad6