From fabd08d87d00bfdf1aacf473fd905fdd3c903ed3 Mon Sep 17 00:00:00 2001 From: songhuangfeng123 <shf18767906695@163.com> Date: 星期五, 02 九月 2022 10:10:14 +0800 Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into genchuang --- incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/baseService/AccidentReportInfoService.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/baseService/AccidentReportInfoService.java b/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/baseService/AccidentReportInfoService.java index cd7a270..6abc9a1 100644 --- a/incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/baseService/AccidentReportInfoService.java +++ b/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); } -- Gitblit v1.9.2