Merge branch 'zx_saas_2022-05-13' of http://git.dayaedu.com/yonge/mec into master_saas

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

@@ -235,7 +235,7 @@ public class StudentOrderController extends BaseController {
             }
         } else if (orderByOrderNo.getGroupType().equals(GroupType.VIP)) {
             if(orderByOrderNo.getType() == OrderTypeEnum.ACTIVITY){
-                orderDetail.put("detail", vipGroupActivityDao.queryByIds(orderByOrderNo.getActivityId()));
+                orderDetail.put("activity", vipGroupActivityDao.queryByIds(orderByOrderNo.getActivityId()));
             }else if (StringUtils.isNotEmpty(orderByOrderNo.getMusicGroupId())) {
                 VipBuyResultDto vipBuyResultInfo = vipGroupService.findVipBuyResultInfo(Integer.valueOf(orderByOrderNo.getMusicGroupId()));
                 orderDetail.put("detail", vipBuyResultInfo);