From 62ef4ba5d19e489e8cb0a87f0e95fbb945dd7fde Mon Sep 17 00:00:00 2001 From: huanghongfa <huanghongfa123456> Date: 星期六, 05 六月 2021 23:48:28 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test --- springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridMemberWarnLogService.java | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridMemberWarnLogService.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridMemberWarnLogService.java index 71087fa..32db760 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridMemberWarnLogService.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridMemberWarnLogService.java @@ -2,10 +2,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.panzhihua.common.model.dtos.grid.EventGridMemberWarnLogAddDTO; -import com.panzhihua.common.model.dtos.grid.EventGridMemberWarnLogDeleteDTO; -import com.panzhihua.common.model.dtos.grid.EventGridMemberWarnLogEditDTO; -import com.panzhihua.common.model.dtos.grid.PageEventGridMemberWarnLogDTO; +import com.panzhihua.common.model.dtos.grid.*; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.grid.EventGridMemberWarnLogDetailsVO; import com.panzhihua.common.model.vos.grid.EventGridMemberWarnLogVO; @@ -56,5 +53,12 @@ */ R<EventGridMemberWarnLogDetailsVO> eventGridMemberWarnLogDetails(Long id); + /** + * 后台获取网格员预警记录 + * @param gridMemberWainDTO 请求参数 + * @return 预警记录 + */ + R gridMemberWorkWarning(EventGridMemberWainDTO gridMemberWainDTO); + } -- Gitblit v1.7.1