Merge branch 'dev_1_2_20220802'

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

@@ -60,6 +60,18 @@ public class MusicSheetSearch  extends QueryInfo{
     @ApiModelProperty(value = "查看我自己的曲目",required = true)
     private Boolean myself;
 
+
+    @ApiModelProperty(value = "是否置顶(0:否;1:是)")
+    private YesOrNoEnum topFlag;  //是否置顶(0:否;1:是)
+
+    public YesOrNoEnum getTopFlag() {
+        return topFlag;
+    }
+
+    public void setTopFlag(YesOrNoEnum topFlag) {
+        this.topFlag = topFlag;
+    }
+
     public Boolean getMyself() {
         return myself;
     }

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

@@ -124,6 +124,10 @@
         <if test="param.chargeType != null">
             and t.charge_type_ = #{param.chargeType}
         </if>
+        <if test="param.topFlag != null">
+            and t.top_flag_ = #{param.topFlag}
+        </if>
+
     </sql>
 
     <select id="selectAlbumDetailPage" resultType="com.yonge.cooleshow.biz.dal.vo.MusicSheetVo">