Merge remote-tracking branch 'origin/feature/0529-live' into feature/0529-live

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

@@ -395,7 +395,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
             imGroup.setGroupType(ImGroup.GroupTypeEnum.SCHOOL);
             imGroup.setCreateTime(new Date());
             imGroup.setUpdateTime(new Date());
-            imGroup.setTenantId(TenantContextHolder.getTenantId());
+            imGroup.setTenantId(cooperationOrgan.getTenantId());
             imGroupDao.insert(imGroup);
             imPluginService.groupCreate(imGroup.getId(), imGroup.getName(), userId.toString());
 

mec-im/src/main/java/com/ym/pojo/RoomResult.java

@@ -56,6 +56,8 @@ public class RoomResult {
     @ApiModelProperty("声部编号")
     private String subjectId;
 
+    @ApiModelProperty("os")
+    private String os;
     public RoomResult rtcRoomConfig(RTCRoomConfig rtcRoomConfig) {
         this.rtcRoomConfig = rtcRoomConfig;
         return this;

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

@@ -309,6 +309,7 @@ public class RoomServiceImpl implements RoomService {
             // 返回直播间配置参数
             roomResult.subjectId(liveRoom.getSubjectId()).setLiveRoomId(liveRoom.getRoomUid());
 
+            roomResult.setOs(liveRoom.getOs());
             // 主动触发用户加入直播间
             // imLiveBroadcastRoomService.joinRoom(liveRoom.getRoomUid(), sysUser.getId());