Merge remote-tracking branch 'origin/dev_1_2_20220802' into dev_1_2_20220802

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/MusicSheetDetailVo.java

@@ -43,9 +43,20 @@ public class MusicSheetDetailVo extends MusicSheet {
     @ApiModelProperty("声部code")
     private String code;
 
+    @ApiModelProperty("声部频率")
+    private Integer aiDefaultFrequency;
+
     @ApiModelProperty("审核理由")
     private String reason;
 
+    public Integer getAiDefaultFrequency() {
+        return aiDefaultFrequency;
+    }
+
+    public void setAiDefaultFrequency(Integer aiDefaultFrequency) {
+        this.aiDefaultFrequency = aiDefaultFrequency;
+    }
+
     public String getOrderNo() {
         return orderNo;
     }

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

@@ -204,6 +204,7 @@
             ) as musicTagNames
             ,s2.name_ as subjectNames
             ,s2.code_ as code
+            ,s2.ai_default_frequency_ as aiDefaultFrequency
         FROM music_sheet t
         left join music_sheet_accompaniment msa on msa.music_sheet_id_ = t.id_
         left join sys_user su on t.create_by_ = su.id_
@@ -251,6 +252,7 @@
         <result column="code" jdbcType="VARCHAR" property="code"/>
         <result column="reason" jdbcType="VARCHAR" property="reason"/>
         <result column="notation" jdbcType="VARCHAR" property="notation"/>
+        <result column="aiDefaultFrequency" jdbcType="VARCHAR" property="aiDefaultFrequency"/>
         <collection property="background" ofType="com.yonge.cooleshow.biz.dal.entity.MusicSheetAccompaniment">
             <id column="accompanimentId" jdbcType="BIGINT" property="id"/>
             <result column="accompanimentMusicSheetId" jdbcType="BIGINT" property="musicSheetId"/>