Merge branch 'dev_v1.3.5_20220929' into online

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

@@ -29,6 +29,12 @@ public class ActivityEvaluationVo extends ActivityEvaluation{
 	@ApiModelProperty(value = "曲目声部ID")
 	private String subjectId;
 
+	@ApiModelProperty("作曲人")
+	private String composer;
+
+	@ApiModelProperty("曲目图片")
+	private String musicImage;
+
 	public String getMusicSheetName() {
 		return musicSheetName;
 	}
@@ -76,4 +82,20 @@ public class ActivityEvaluationVo extends ActivityEvaluation{
 	public void setSubjectId(String subjectId) {
 		this.subjectId = subjectId;
 	}
+
+	public String getComposer() {
+		return composer;
+	}
+
+	public void setComposer(String composer) {
+		this.composer = composer;
+	}
+
+	public String getMusicImage() {
+		return musicImage;
+	}
+
+	public void setMusicImage(String musicImage) {
+		this.musicImage = musicImage;
+	}
 }

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

@@ -34,6 +34,8 @@
             <include refid="baseColumns" />
             , ms.music_sheet_name_ as musicSheetName
             , ms.music_subject_ AS subjectId
+            , ms.title_img_ AS musicImage
+            , ms.composer_ AS composer
             , (select group_concat(mt.name_) from music_tag mt where find_in_set(mt.id_,ms.music_tag_) and mt.del_flag_ = 0  and mt.state_ = 1) as musicTagNames
             , (select group_concat(s.name_) from subject s where find_in_set(s.id_,ms.music_subject_) and s.del_flag_ = 0 ) as subjectNames
             , ms.source_type_ as sourceType