Merge remote-tracking branch 'origin/dev'

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/ResiGroupService.java

@@ -1,7 +1,6 @@
 package com.epmet.dataaggre.service.resigroup;
 
 import com.epmet.dataaggre.dto.resigroup.ResiTopicDTO;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -10,5 +9,5 @@ import java.util.List;
  * @DateTime 2020/12/25 上午9:21
  */
 public interface ResiGroupService {
-    List<ResiTopicDTO> selectTopicInfoByIds(@Param("topicIds") List<String> topicIds);
+    List<ResiTopicDTO> selectTopicInfoByIds(List<String> topicIds);
 }