Merge branch 'online' of http://git.dayaedu.com/yonge/cooleshow into zx_online_cbs

# Conflicts:
#	cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/controller/MusicSheetController.java

cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/controller/MusicSheetController.java

@@ -52,7 +52,7 @@ import java.util.Optional;
  * @version v1.0
  **/
 @RestController
-@RequestMapping("${app-config.url.teacher:}/")
+@RequestMapping("${app-config.url.teacher:}/music/sheet")
 @Api(tags = "曲谱表 API接口")
 public class MusicSheetController extends BaseController {
     @Resource