Merge remote-tracking branch 'Y1NanPing/master'
# Conflicts: # service-client/service-album-client/src/main/java/com/atguigu/tingshu/album/AlbumFeignClient.java # service-client/service-album-client/src/main/java/com/atguigu/tingshu/album/impl/AlbumDegradeFeignClient.java # service-client/service-album-client/target/classes/com/atguigu/tingshu/album/AlbumFeignClient.class # service-client/service-album-client/target/classes/com/atguigu/tingshu/album/impl/AlbumDegradeFeignClient.class # service/service-album/src/main/java/com/atguigu/tingshu/album/api/BaseCategoryApiController.java # service/service-album/src/main/java/com/atguigu/tingshu/album/api/TrackInfoApiController.java # service/service-album/src/main/java/com/atguigu/tingshu/album/mapper/TrackInfoMapper.java # service/service-album/src/main/java/com/atguigu/tingshu/album/service/TrackInfoService.java # service/service-album/src/main/java/com/atguigu/tingshu/album/service/impl/AlbumInfoServiceImpl.java # service/service-album/src/main/java/com/atguigu/tingshu/album/service/impl/BaseCategoryServiceImpl.java # service/service-album/src/main/java/com/atguigu/tingshu/album/service/impl/TrackInfoServiceImpl.java # service/service-album/src/main/resources/mapper/TrackInfoMapper.xml # service/service-album/target/classes/com/atguigu/tingshu/album/api/AlbumInfoApiController.class # service/service-album/target/classes/com/atguigu/tingshu/album/api/BaseCategoryApiController.class # service/service-album/target/classes/com/atguigu/tingshu/album/api/TrackInfoApiController.class # service/service-album/target/classes/com/atguigu/tingshu/album/mapper/TrackInfoMapper.class # service/service-album/target/classes/com/atguigu/tingshu/album/service/AlbumInfoService.class # service/service-album/target/classes/com/atguigu/tingshu/album/service/TrackInfoService.class # service/service-album/target/classes/com/atguigu/tingshu/album/service/impl/AlbumInfoServiceImpl.class # service/service-album/target/classes/com/atguigu/tingshu/album/service/impl/BaseCategoryServiceImpl.class # service/service-album/target/classes/com/atguigu/tingshu/album/service/impl/TrackInfoServiceImpl.class # service/service-album/target/classes/mapper/TrackInfoMapper.xml # service/service-search/src/main/java/com/atguigu/tingshu/search/api/SearchApiController.java # service/service-search/src/main/java/com/atguigu/tingshu/search/service/SearchService.java # service/service-search/src/main/java/com/atguigu/tingshu/search/service/impl/SearchServiceImpl.java # service/service-search/target/classes/com/atguigu/tingshu/search/api/SearchApiController.class # service/service-search/target/classes/com/atguigu/tingshu/search/service/SearchService.class # service/service-search/target/classes/com/atguigu/tingshu/search/service/impl/SearchServiceImpl.class # service/service-user/target/classes/com/atguigu/tingshu/user/service/impl/UserInfoServiceImpl.class
This commit is contained in:
commit
34cb7047bb
|
@ -18,6 +18,7 @@ import org.springframework.validation.annotation.Validated;
|
|||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@Tag(name = "专辑管理")
|
||||
@RestController
|
||||
|
|
Loading…
Reference in New Issue