Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -291,9 +291,11 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
         for (MusicalListDetailDto musicalListDetailDto : musicalListDetailDtos) {
             for (SubjectChange studentGoods : studentGoodies) {
                 if (!musicalListDetailDto.getUserId().equals(studentGoods.getStudentId())) continue;
+                musicalListDetailDto.setMusicalName("");
                 if (studentGoods.getChangeMusicalGoods() != null) {
                     musicalListDetailDto.setMusicalName(studentGoods.getChangeMusicalGoods().getName());
                 }
+                musicalListDetailDto.setAccessoriesName("");
                 if (studentGoods.getChangeAccessoriesGoods() != null) {
                     List<Goods> changeAccessoriesGoods = studentGoods.getChangeAccessoriesGoods();
                     changeAccessoriesGoods.sort(Comparator.comparing(Goods::getId));