Merge branch 'network_room' of http://git.dayaedu.com/yonge/mec into test

 Conflicts:

	mec-im/src/main/java/com/ym/controller/RoomController.java

mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -1038,7 +1038,7 @@ public class RoomServiceImpl implements RoomService {
             type = DeviceTypeEnum.Camera;
             enable = data.getCameraOn();
         } else if (data.getMicrophoneOn() != null) {
-            type = DeviceTypeEnum.Camera;
+            type = DeviceTypeEnum.Microphone;
             enable = data.getMicrophoneOn();
         } else if (data.getMusicModeOn() != null) {
             type = DeviceTypeEnum.MusicMode;