Merge branch '2022DoubleEleven' of http://git.dayaedu.com/yonge/mec into master_saas

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

@@ -118,7 +118,7 @@ public class ActivityController extends BaseController {
     @GetMapping("/queryStudentDoubleEleven2022Order")
     public Object queryStudentDoubleEleven2022Order() {
         SysUser user = sysUserService.getUser();
-        List<ActivityDetailDto> activityDetailDtos = marketActivityService.queryActivity(3, user.getOrganId());
+        List<ActivityDetailDto> activityDetailDtos = marketActivityService.queryActivity(4, user.getOrganId());
         String activitys = studentPaymentOrderDao.queryStudentDoubleElevenOrder(user.getId());
         List<Integer> activityList = new ArrayList<>();
         if(StringUtils.isNotEmpty(activitys)){