Merge branch 'zx_saas_scoreType' of http://git.dayaedu.com/yonge/mec into dev

mec-biz/src/main/java/com/ym/mec/biz/dal/wrapper/MusicSheetWrapper.java

@@ -220,7 +220,7 @@ public class MusicSheetWrapper {
         private Boolean isConvertibleScore;
 
         @ApiModelProperty("谱面类型")
-        private String scoreType;
+        private EDefaultScoreType scoreType;
     }
 
     @Data

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

@@ -261,7 +261,7 @@
 			<if test="isConvertibleScore != null">
 				AND ses.is_convertible_score_ = #{isConvertibleScore}
 			</if>
-			<if test="scoreType != null">
+			<if test="scoreType != null and scoreType != ''">
 				AND ses.score_type_ = #{scoreType}
 			</if>
 			<if test="subjectId != null">