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

songhuangfeng123

2022-08-22 652fca264c2468782a2d5a4fbe21a13df448b91a

 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/baseService/AccidentReportInfoService.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 java.util.List;

@@ -24,6 +24,6 @@

    void deleteAccidentReportById(Long teamId);

    List<AccidentReportCount> selectByTimeAndType(AccidentReportRPCDBQuery dbQuery);
    List<AccidentReportCount> selectByTimeAndType(AccidentReportCountDBQuery dbQuery);

}