Merge branch 'zx_online_cbs' of http://git.dayaedu.com/yonge/cooleshow into develop-new

cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicSheetMapper.xml

@@ -388,7 +388,7 @@
         <result column="musicJianSvg" jdbcType="VARCHAR" property="musicJianSvg"/>
         <result column="musicFirstSvg" jdbcType="VARCHAR" property="musicFirstSvg"/>
         <result column="musicSheetType" jdbcType="VARCHAR" property="musicSheetType"/>
-        <result column="musicSheetType" jdbcType="VARCHAR" property="musicSheetJson"/>
+        <result column="musicSheetJson" jdbcType="VARCHAR" property="musicSheetJson"/>
         <collection property="background" ofType="com.yonge.cooleshow.biz.dal.entity.MusicSheetAccompaniment">
             <id column="accompanimentId" jdbcType="BIGINT" property="id"/>
             <result column="accompanimentMusicSheetId" jdbcType="BIGINT" property="musicSheetId"/>