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

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/MusicSheetSearch.java

@@ -107,13 +107,13 @@ public class MusicSheetSearch  extends QueryInfo{
     private Long sortByAlbumIdDesc;
 
     @ApiModelProperty("谱面类型")
-    private EDefaultScoreType scoreType;
+    private String scoreType;
 
-    public EDefaultScoreType getScoreType() {
+    public String getScoreType() {
         return scoreType;
     }
 
-    public void setScoreType(EDefaultScoreType scoreType) {
+    public void setScoreType(String scoreType) {
         this.scoreType = scoreType;
     }
 

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

@@ -236,7 +236,7 @@
             and msar.last_audit_state_ = #{param.auditStatus}
         </if>
         <if test="param.scoreType != null">
-            and t.score_type_ = #{param.auditStatus}
+            and t.score_type_ = #{param.scoreType}
         </if>
         <if test="param.createBy != null">
             and t.create_by_ = #{param.createBy}