Merge branch 'feature/0803-im'

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ImNetworkRoomServiceImpl.java

@@ -468,7 +468,9 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
                     if(deviceControl.getEnable() != null){
                         courseSchedule.setMuteAll(!deviceControl.getEnable());
                     }
-                    courseSchedule.setCancelMuteFlag(deviceControl.getCancelMuteFlag());
+                    if(deviceControl.getCancelMuteFlag() != null){
+                        courseSchedule.setCancelMuteFlag(deviceControl.getCancelMuteFlag());
+                    }
                     courseScheduleService.updateById(courseSchedule);
                     // 修改网管课群自定义属性
                     RTCRoomPluginService pluginService = imGroupService.getRTCRoomPluginService(courseSchedule.getServiceProvider());