Merge branch 'zx_saas_cbs_category' of http://git.dayaedu.com/yonge/mec into test

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysMusicScoreServiceImpl.java

@@ -210,7 +210,7 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
         record.setPlayMode(SysMusicScore.PlayMode.valueOf(musicSheetApplication.getPlayMode().getCode()));
         record.setExtConfigJson(musicSheetApplication.getExtConfigJson());
         record.setExtStyleConfigJson(musicSheetApplication.getExtStyleConfigJson());
-        record.setClientShowFlag(musicSheetApplication.getStatus()?1:0);
+        record.setShowFlag(musicSheetApplication.getStatus()?1:0);
 //        if(musicSheetApplication.getMusicSheetCategoryId() != null){
 //            record.setMusicScoreCategoriesId(musicSheetApplication.getMusicSheetCategoryId().intValue());
 //            record.setCategoriesId(musicSheetApplication.getMusicSheetCategoryId().intValue());

mec-biz/src/main/resources/config/mybatis/SysMusicScoreMapper.xml

@@ -26,7 +26,7 @@
 		<result column="create_user_name_" property="createUserName" />
 		<result column="is_open_metronome_" property="isOpenMetronome" />
 		<result column="del_flag_" property="delFlag" />
-		<result column="show_flag_" property="showFlag" />
+		<result column="show_flag_" property="clientShowFlag" />
 		<result column="order_" property="order" />
 		<result column="rank_ids_" property="rankIds" />
 		<result column="render_from_" property="renderFrom" />