Merge branch 'online1' into test

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

@@ -233,7 +233,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         if (detailDto.getMusicalName() != null) {
             StudentFeeDto studentFeeDto = new StudentFeeDto();
             studentFeeDto.setGoodsName(detailDto.getMusicalName());
-            studentFeeDto.setGoodsType("MUSICAL");
+            studentFeeDto.setGoodsType("INSTRUMENT");
             studentFeeDto.setMusicalFee(detailDto.getMusicalAmount());
             studentFeeDtos.add(studentFeeDto);
         }