Merge branch 'online1'

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

@@ -350,6 +350,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                         || musicGroupSubjectGoodsGroup.getKitGroupPurchaseTypeJson().equals("{}"))) {
                     throw new BizException(musicGroupSubjectGoodsGroup.getName() + " 请选择提供方式");
                 }
+                if(musicGroupSubjectGoodsGroup.getGroupRemissionCourseFee() == null){
+                    musicGroupSubjectGoodsGroup.setGroupRemissionCourseFee(0);
+                }
             }
             musicGroupSubjectGoodsGroupDao.batchInsert(musicGroupSubjectGoodsGroups, musicGroupId);
         }
@@ -977,6 +980,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                             || musicGroupSubjectGoodsGroup.getKitGroupPurchaseTypeJson().equals("{}"))) {
                         throw new BizException(musicGroupSubjectGoodsGroup.getName() + " 请选择提供方式");
                     }
+                    if(musicGroupSubjectGoodsGroup.getGroupRemissionCourseFee()==null){
+                        musicGroupSubjectGoodsGroup.setGroupRemissionCourseFee(0);
+                    }
                 }
 
                 musicGroupSubjectGoodsGroupDao.batchInsert(subFeeSettingDto.getMusicGroupSubjectGoodsGroups(), musicGroupId);