Merge branch 'zx_online_cbs' into develop-new

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/MusicTagDao.java

@@ -58,7 +58,7 @@ public interface MusicTagDao extends BaseMapper<MusicTag> {
 	 */
     Integer checkTagBeUsedMusicAlbum(@Param("longs") List<Long> longs);
 
-    List<CbsMusicSheetTagWrapper.MusicSheetTag> tagList(@Param("queryInfo") CbsMusicSheetTagWrapper.MusicSheetTagQuery queryInfo);
+    List<CbsMusicSheetTagWrapper.MusicSheetTag> tagList(@Param("param") CbsMusicSheetTagWrapper.MusicSheetTagQuery queryInfo);
 
-	List<CbsMusicSheetCategoryWrapper.MusicSheetCategory> categoryList(@Param("queryInfo") CbsMusicSheetCategoryWrapper.MusicSheetCategoryQuery queryInfo);
+	List<CbsMusicSheetCategoryWrapper.MusicSheetCategory> categoryList(@Param("param") CbsMusicSheetCategoryWrapper.MusicSheetCategoryQuery queryInfo);
 }