Merge branch 'feature/0731-bugfix' into master_saas

mec-im/src/main/java/com/ym/enums/DeviceTypeEnum.java

@@ -7,7 +7,8 @@ public enum DeviceTypeEnum {
     HandUp(4),
     ExamSong(5),
     MusicScore(6),
-    MusicScoreAccompaniment(7),;
+    MusicScoreAccompaniment(7),
+    ;
 
 
     private int value;

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

@@ -1872,9 +1872,9 @@ public class RoomServiceImpl implements RoomService {
             }
 
             // 取消网络课群静音
-            /*if (Objects.nonNull(data.getCancelMuteFlag())) {
+            if (Objects.nonNull(data.getCancelMuteFlag()) && Objects.isNull(data.getMicrophoneOn())) {
                 return true;
-            }*/
+            }
         }
 
         // 课程老师信息