Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safeP...

songhuangfeng123

2022-09-02 fabd08d87d00bfdf1aacf473fd905fdd3c903ed3

 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/repository/AccidentReportInfoRepository.java

@@ -7,7 +7,7 @@
import com.gkhy.safePlatform.incidentManage.entity.AccidentReportInfoDetailDO;
import com.gkhy.safePlatform.incidentManage.entity.AccidentReportInfoPageDO;
import com.gkhy.safePlatform.incidentManage.query.db.AccidentReportDBQuery;
import com.gkhy.safePlatform.incidentManage.query.db.AccidentReportRPCDBQuery;
import com.gkhy.safePlatform.incidentManage.query.db.AccidentReportCountDBQuery;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;

@@ -26,5 +26,5 @@

    void deleteAccidentReportById(@Param("id") Long id);

    List<AccidentReportCount> selectByTimeAndType(@Param("query")AccidentReportRPCDBQuery dbQuery);
    List<AccidentReportCount> selectByTimeAndType(@Param("query") AccidentReportCountDBQuery dbQuery);
}