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

mec-im/src/main/java/com/ym/dao/RoomDao.java

@@ -18,8 +18,7 @@ import java.util.List;
 public interface RoomDao extends JpaRepository<Room, Long> {
     Room findByRid(String rid);
 
-    @Lock(value = LockModeType.PESSIMISTIC_WRITE)
-    @Query(value = "select * from rongyun_room where rid=?1", nativeQuery = true)
+    @Query(value = "select * from rongyun_room where rid=?1 FOR UPDATE", nativeQuery = true)
     Room findByLockRid(String rid);
 
     @Modifying