Merge remote-tracking branch 'origin/master'

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

@@ -43,7 +43,7 @@ public class AppletTeachingVideoInfoController extends BaseController {
     }
 
     /**
-     * 查询教学视频列表
+     * 查询教学视频列表1
 
     @GetMapping("/list/{pid}")
     @ApiOperation("查询教学视频列表")