合并冲突解决

ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/ReservedConferenceMapper.java

@@ -1,7 +1,7 @@
 package com.ruoyi.wisdomarbitrate.mapper;
 
 import com.ruoyi.wisdomarbitrate.domain.ReservedConference;
-import org.springframework.data.repository.query.Param;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 
@@ -34,4 +34,7 @@ public interface ReservedConferenceMapper {
      * @param roomId
      */
     void deleteByRoomId(@Param("roomId")String roomId);
+
+
+    void batchDeleteByIds(@Param("ids") List<Long> ids);
 }