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

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

@@ -17,7 +17,7 @@ import java.util.List;
 public interface RoomMemberDao extends JpaRepository<RoomMember, Long> {
     List<RoomMember> findByRid(String rid);
 
-    @Lock(value = LockModeType.PESSIMISTIC_WRITE)
+    //@Lock(value = LockModeType.PESSIMISTIC_WRITE)
     RoomMember findByRidAndUid(String rid, String uid);
 
     List<RoomMember> findByRidAndRole(String rid, int role);