Merge branch 'website_1_1_20220802' into online

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/MusicSheetServiceImpl.java

@@ -823,6 +823,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         teacherMusicSheetListVo.setUserId(teacherVo.getUserId());
         teacherMusicSheetListVo.setEntryFlag(teacherVo.getEntryFlag());
         teacherMusicSheetListVo.setMusicianFlag(teacherVo.getMusicianFlag());
+        teacherMusicSheetListVo.setTag(teacherVo.getTag());
 
         TeacherTotal total = totalService.getTotalById(detail.getUserId());
         if (total != null) {

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/TeacherMusicSheetListVo.java

@@ -3,7 +3,6 @@ package com.yonge.cooleshow.biz.dal.vo;
 import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import io.swagger.models.auth.In;
 
 import java.util.List;
 
@@ -19,6 +18,9 @@ public class TeacherMusicSheetListVo {
     @ApiModelProperty("老师id")
     private Long userId;
 
+    @ApiModelProperty("老师点亮图标 STYLE:个人风采 VIDEO：视频课 LIVE：直播课，MUSIC：曲目 ")
+    private String tag;
+
     @ApiModelProperty("上传老师名称")
     private String userName;
 
@@ -43,6 +45,15 @@ public class TeacherMusicSheetListVo {
     @ApiModelProperty("老师曲目 默认最新的5个")
     private List<MusicSheetVo> musicSheetList;
 
+
+    public String getTag() {
+        return tag;
+    }
+
+    public void setTag(String tag) {
+        this.tag = tag;
+    }
+
     public YesOrNoEnum getIsVip() {
         return isVip;
     }

cooleshow-user/user-website/src/main/java/com/yonge/cooleshow/website/controller/open/OpenVideoGroupController.java

@@ -81,6 +81,9 @@ public class OpenVideoGroupController extends BaseController {
     @ApiOperation(value = "其他课程")
     @PostMapping("/otherLesson")
     public HttpResponseResult<List<VideoLessonGroupVo>> otherLesson(@RequestBody VideoLessonGroupSearch query) {
+
+        // 检查app版本
+        query.setAuditVersion(appVersionInfoService.getAppAuditVersion(query.getPlatform(),query.getVersion()));
         return succeed(videoLessonGroupService.selectPage(query));
     }
 }