From 9ca0dc6e7833715b875cc9b6b91d5c497b2bae8b Mon Sep 17 00:00:00 2001
From: zf <1603559716@qq.com>
Date: 星期三, 30 八月 2023 09:05:45 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/hazardInvestigationSystem into zf
---
src/main/java/com/gk/hotwork/Service/SafetyInspectionItemService.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/gk/hotwork/Service/SafetyInspectionItemService.java b/src/main/java/com/gk/hotwork/Service/SafetyInspectionItemService.java
index 0135418..e666d59 100644
--- a/src/main/java/com/gk/hotwork/Service/SafetyInspectionItemService.java
+++ b/src/main/java/com/gk/hotwork/Service/SafetyInspectionItemService.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.gk.hotwork.Domain.SafetyInspectionItem;
import com.gk.hotwork.Domain.UserInfo;
+import com.gk.hotwork.Domain.dto.resp.SafetyInspectionElementRespDTO;
import java.util.List;
import java.util.Map;
@@ -15,7 +16,7 @@
* @Description: 分页
*/
IPage<SafetyInspectionItem> selectPage(Page<SafetyInspectionItem> page, Map<String, Object> filter, UserInfo user);
-
+ IPage<SafetyInspectionItem> selectCPage(Page<SafetyInspectionItem> page, Map<String, Object> filter, UserInfo user);
/**
* @Description: 新增
@@ -33,7 +34,9 @@
*/
void delOne(Long id, UserInfo user);
- List<SafetyInspectionItem> infoElementA(Long id, UserInfo user);
+ SafetyInspectionElementRespDTO infoElementA(Long id, UserInfo user);
SafetyInspectionItem info(Long id, UserInfo user);
+
+
}
--
Gitblit v1.9.2