瀏覽代碼

Merge branch 'dev_v1.3.8_20221209'

# Conflicts:
#	cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicSheetMapper.xml
Eric 2 年之前
父節點
當前提交
f6d9e9fc8d
共有 1 個文件被更改,包括 5 次插入5 次删除
  1. 5 5
      cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicSheetMapper.xml

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

@@ -35,6 +35,8 @@
         <result column="accompaniment_type_" jdbcType="VARCHAR" property="accompanimentType"/>
         <result column="title_img_" jdbcType="VARCHAR" property="titleImg"/>
         <result column="music_img_" jdbcType="VARCHAR" property="musicImg"/>
+        <result column="first_tone_" jdbcType="VARCHAR" property="firstTone"/>
+        <result column="fixed_tone_" jdbcType="VARCHAR" property="fixedTone"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -84,7 +86,9 @@
         t.music_json_ as musicJSON,
         t.music_svg_ as musicSvg,
         t.music_jian_svg_ as musicJianSvg,
-        t.music_first_svg_ as musicFirstSvg
+        t.music_first_svg_ as musicFirstSvg,
+        t.first_tone_ as firstTone,
+        t.fixed_tone_ as fixedTone
     </sql>
 
     <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.vo.MusicSheetVo">
@@ -309,10 +313,6 @@
         <result column="auditName" jdbcType="VARCHAR" property="auditName"/>
         <result column="auditReason" jdbcType="VARCHAR" property="auditReason"/>
         <result column="aiDefaultFrequency" jdbcType="VARCHAR" property="aiDefaultFrequency"/>
-        <result column="musicJSON" jdbcType="VARCHAR" property="musicJSON"/>
-        <result column="musicSvg" jdbcType="VARCHAR" property="musicSvg"/>
-        <result column="musicJianSvg" jdbcType="VARCHAR" property="musicJianSvg"/>
-        <result column="musicFirstSvg" jdbcType="VARCHAR" property="musicFirstSvg"/>
         <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"/>