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

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/MusicSheetServiceImpl.java

@@ -601,6 +601,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
                     if(detailVo == null){
                         throw new BizException("未找到曲目信息");
                     }
+                    id = authRecord.getMusicSheetId().toString();
                 }
             }
             if(result == null){

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

@@ -887,7 +887,7 @@
             update music_sheet ms set
             ms.music_tag_ = #{item.musicTagIds},ms.payment_type_ = #{item.paymentType},
             ms.charge_type_ = #{item.paymentType},
-            ms.music_price_ = #{item.musicPrice},ms.top_flag_ = #{item.topFlag},
+            ms.top_flag_ = #{item.topFlag},
             ms.exquisite_flag_ = #{item.exquisiteFlag},ms.sort_number_ = #{item.sortNo},ms.del_flag_ = 0,
             ms.audit_status_ = 'PASS',
             ms.state_ = #{item.status},