merge

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

@@ -10,10 +10,10 @@ public class CourseScheduleStudentMusicSheetResult extends CourseScheduleStudent
     private String mp3Url;
 
     @ApiModelProperty(value = "伴奏")
-    private String audioFileUrl;
+    private String url;
 
     @ApiModelProperty(value = "曲目名")
-    private String musicSheetName;
+    private String musicScoreName;
 
     @ApiModelProperty(value = "伴奏音量")
     private Integer soundVolume = 100;

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

@@ -54,9 +54,9 @@
     </update>
 
     <resultMap id="CourseScheduleStudentMusicSheetResult" type="com.yonge.cooleshow.biz.dal.dto.CourseScheduleStudentMusicSheetResult" extends="BaseResultMap">
-        <result property="audioFileUrl" column="audio_file_url_"/>
+        <result property="url" column="audio_file_url_"/>
         <result property="mp3Url" column="mp3_url_"/>
-        <result property="musicSheetName" column="music_sheet_name_"/>
+        <result property="musicScoreName" column="music_sheet_name_"/>
     </resultMap>
     <select id="queryBySheetIdAndCourseId" resultMap="CourseScheduleStudentMusicSheetResult">
         SELECT cssm.*,msa.audio_file_url_ mp3_url_,ms.audio_file_url_,ms.music_sheet_name_  FROM course_schedule_student_music_sheet cssm

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

@@ -5,7 +5,7 @@
         <id column="id_" jdbcType="INTEGER" property="id"/>
         <result column="room_id_" jdbcType="VARCHAR" property="roomId"/>
         <result column="user_id_" jdbcType="INTEGER" property="userId"/>
-        <result column="username_" jdbcType="VARCHAR" property="username"/>
+        <result column="username_" jdbcType="VARCHAR" property="userName"/>
         <result column="avatar_" jdbcType="VARCHAR" property="avatar"/>
         <result column="join_time_" jdbcType="TIMESTAMP" property="joinTime"/>
         <result column="role_" jdbcType="INTEGER" property="role"/>
@@ -21,7 +21,7 @@
                                            mic_flag_, music_mode_flag_, hand_flag_,username_,avatar_)
         VALUES (#{entity.roomId}, #{entity.userId},NOW(), #{entity.role},
                 #{entity.camera}, #{entity.microphone}, #{entity.musicModeOn},
-                #{entity.handUpOn}, #{entity.username}, #{entity.avatar})
+                #{entity.handUpOn}, #{entity.userName}, #{entity.avatar})
         ON DUPLICATE KEY UPDATE
         room_id_ = VALUES(room_id_),
         user_id_ = VALUES(user_id_),