Merge branch 'fix/1104-msuic-img' into test

# Conflicts:
#	mec-biz/src/main/java/com/ym/mec/biz/dal/entity/SysMusicScoreAccompaniment.java

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/SysMusicScoreAccompaniment.java

@@ -147,9 +147,27 @@ public class SysMusicScoreAccompaniment {
 	@ApiModelProperty("使用状态 试用： FREE 锁定： LOCK 解锁：UNLOCK")
 	private String useStatus;
 
+	@ApiModelProperty("五线谱图片")
+	private String musicImg;
+
+	@ApiModelProperty("首调图片")
+	private String musicFirstImg;
+
+	@ApiModelProperty("固定调图片")
+	private String musicJianImg;
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);
 	}
 
+	public SysMusicScoreAccompaniment musicJianImg(String musicJianImg) {
+		this.musicJianImg = musicJianImg;
+		return this;
+	}
+
+	public SysMusicScoreAccompaniment musicImg(String musicImg) {
+		this.musicImg = musicImg;
+		return this;
+	}
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ExportServiceImpl.java

@@ -2937,7 +2937,7 @@ public class ExportServiceImpl implements ExportService {
             //获取乐团信息
             this.initMusicGroupInfo(basicOrder, musicGroupNameMap, firstMusicMap, userLastMusicIdMap, userLastMusicNameMap, calenderCooperationMap);
             //填充备注信息
-            if (basicOrder.getGoodsList() != null) {
+            if (CollectionUtils.isNotEmpty(basicOrder.getGoodsList())) {
                 String goodsName = basicOrder.getGoodsList().stream().map(Goods::getName).collect(Collectors.joining("|"));
                 basicOrder.setMemo(goodsName);
             }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysMusicScoreAccompanimentServiceImpl.java

@@ -182,6 +182,12 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Strin
 				record.setMusicPdfUrl(musicSheetApplication.getMusicPdfUrl());
 				record.setFirstPdfUrl(musicSheetApplication.getFirstPdfUrl());
 				record.setJianPdfUrl(musicSheetApplication.getJianPdfUrl());
+
+				// 设置五线谱、首调、固定调谱面图片
+				record.musicImg(musicSheetApplication.getMusicImg())
+					.musicJianImg(musicSheetApplication.getMusicJianImg())
+					.setMusicFirstImg(musicSheetApplication.getMusicFirstImg());
+
 				record.setIsMixBeat(musicSheetApplication.getIsMixBeat());
 				record.setIsConvertibleScore(musicSheetApplication.getIsConvertibleScore());
 				if(musicSheetApplication.getScoreType() != null){