From 9a73660fa673120de8fb4fdacdfe2a9f47fe9fbb Mon Sep 17 00:00:00 2001
From: zhangfeng <1603559716@qq.com>
Date: 星期二, 08 十一月 2022 08:38:10 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyWorkApproveInfoService.java | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyWorkApproveInfoService.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyWorkApproveInfoService.java
index 8bd7d12..89d01e1 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyWorkApproveInfoService.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/baseService/EmergencyWorkApproveInfoService.java
@@ -5,8 +5,6 @@
import com.gkhy.safePlatform.emergency.entity.EmergencyWorkApproveInfo;
import com.gkhy.safePlatform.emergency.entity.EmergencyWorkApproveInfoDetailDO;
import com.gkhy.safePlatform.emergency.entity.EmergencyWorkApproveInfoPageDO;
-import com.gkhy.safePlatform.emergency.enums.ApproveStatus;
-import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyPlanPageRespDTO;
import com.gkhy.safePlatform.emergency.query.db.EmergencyWorkApproveDBQuery;
import java.util.List;
@@ -24,5 +22,5 @@
void deleteWorkApproveById(Long teamId);
- List<EmergencyWorkApproveInfoPageDO> selectWorkApproveByRelateTypeAndRelateId(Integer type, Long id);
+ List<EmergencyWorkApproveInfoDetailDO> selectWorkApproveByRelateTypeAndRelateId(Integer type, Long id);
}
--
Gitblit v1.9.2