Browse Source

Merge branch 'master' of ssh://192.168.8.213:10022/miaxis/zzjs

Althars123 3 years ago
parent
commit
e4bf5ae082

+ 1 - 3
zzjs-admin/src/main/java/com/miaxis/app/controller/teachingVideo/AppletTeachingVideoInfoController.java

@@ -30,16 +30,14 @@ public class AppletTeachingVideoInfoController extends BaseController {
 
 
     private final ITeachingVideoTypeInfoService videoTypeInfoService;
     private final ITeachingVideoTypeInfoService videoTypeInfoService;
 
 
-    /**
     @GetMapping("/typeList")
     @GetMapping("/typeList")
     @ApiOperation("查询教学视频一级分类列表")
     @ApiOperation("查询教学视频一级分类列表")
     public Response typeList(){
     public Response typeList(){
         return Response.success(videoTypeInfoService.list(new QueryWrapper<TeachingVideoTypeInfo>().eq("pid",0).eq("status",0).orderByAsc("type_sort")));
         return Response.success(videoTypeInfoService.list(new QueryWrapper<TeachingVideoTypeInfo>().eq("pid",0).eq("status",0).orderByAsc("type_sort")));
     }
     }
-    */
 
 
     /**
     /**
-     * 查询教学视频列表
+     * 查询教学视频列表1
 
 
     @GetMapping("/list/{pid}")
     @GetMapping("/list/{pid}")
     @ApiOperation("查询教学视频列表")
     @ApiOperation("查询教学视频列表")