Merge branch 'online1' of http://git.dayaedu.com/yonge/mec

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

@@ -237,7 +237,7 @@ public class RoomServiceImpl implements RoomService {
         return roomResult;
     }
 
-    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class,isolation = Isolation.READ_COMMITTED)
+    @Transactional(propagation = Propagation.REQUIRES_NEW, rollbackFor = Exception.class,isolation = Isolation.READ_COMMITTED)
     @Override
     public void joinRoomSuccess(String roomId,String userId) throws Exception {
         RoomMember roomMember = roomMemberDao.findByRidAndUid(roomId, userId);