Merge remote-tracking branch 'origin/develop' into develop

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

@@ -1,4 +1,4 @@
-package com.yonge.cooleshow.teacher;
+package com.yonge.cooleshow.teacher.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.microsvc.toolkit.common.response.paging.QueryInfo;
@@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @version v1.0
  **/
 @RestController
-@RequestMapping("/tenantAlbumMusic")
+@RequestMapping("${app-config.url.teacher:}/tenantAlbumMusic")
 @Api(tags = "机构专辑曲目 API接口")
 public class TenantAlbumSheetController extends BaseController {
 

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

@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
 @Slf4j
 @Validated
 @RestController
-@RequestMapping("/userTenantAlbumRecord")
+@RequestMapping("${app-config.url.teacher:}/userTenantAlbumRecord")
 @Api(tags = "购买训练工具记录")
 public class UserTenantAlbumRecordController {
 
@@ -27,7 +27,7 @@ public class UserTenantAlbumRecordController {
 
 
     @ApiOperation(value = "查询机构专辑详情")
-    @PostMapping("/albumDetail")
+    @PostMapping("/detail")
     public HttpResponseResult <TenantAlbumWrapper.TenantAlbum> albumDetail(@RequestParam(defaultValue = "") String albumId) {
         TenantAlbumWrapper.TenantAlbum tenantAlbum= musicAlbumService.detailAlbum(albumId);
         return HttpResponseResult.succeed(tenantAlbum);