Merge branch '2021-double-eleven' of http://git.dayaedu.com/yonge/mec

mec-student/src/main/java/com/ym/mec/student/controller/ActivityController.java

@@ -75,9 +75,9 @@ public class ActivityController extends BaseController {
             return failed("用户信息有误，没有分部信息");
         }
         Map<String,Object> resultMap = new HashMap<>(3);
-        resultMap.put("activityDetailList",marketActivityService.queryActivity(13,sysUser.getOrganId()));
-        resultMap.put("horseRaceLampList",luckDrawPrizeService.queryHorseRaceLampDto(3));
-        LuckDrawCount luckDrawCount = luckDrawCountService.findByIdAndGroupId(sysUser.getId(),3);
+        resultMap.put("activityDetailList",marketActivityService.queryActivity(2,sysUser.getOrganId()));
+        resultMap.put("horseRaceLampList",luckDrawPrizeService.queryHorseRaceLampDto(2));
+        LuckDrawCount luckDrawCount = luckDrawCountService.findByIdAndGroupId(sysUser.getId(),2);
         if(luckDrawCount != null){
             resultMap.put("drawNum",luckDrawCount.getAvailableCount());
         }else {