From 8788a78ad30c1bb9d50d91b10e76d3ae47ed8da2 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 07 六月 2021 09:28:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_future_wangge' into test_future_wangge

---
 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridMemberGpsLogService.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/EventGridMemberGpsLogService.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridMemberGpsLogService.java
index 2590a91..2c879b5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridMemberGpsLogService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridMemberGpsLogService.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.EventGridMemberGpsLogAddDTO;
-import com.panzhihua.common.model.dtos.grid.EventGridMemberGpsLogDeleteDTO;
-import com.panzhihua.common.model.dtos.grid.EventGridMemberGpsLogEditDTO;
-import com.panzhihua.common.model.dtos.grid.PageEventGridMemberGpsLogDTO;
+import com.panzhihua.common.model.dtos.grid.*;
 import com.panzhihua.common.model.vos.R;
 import com.panzhihua.common.model.vos.grid.EventGridMemberGpsLogDetailsVO;
 import com.panzhihua.common.model.vos.grid.EventGridMemberGpsLogVO;
@@ -63,5 +60,12 @@
      */
     R getTrajectoryByApp(Long userId);
 
+    /**
+     * 后台获取网格员运动轨迹
+     * @param workTrajectoryDTO 请求参数
+     * @return  运动轨迹
+     */
+    R gridMemberWorkTrajectory(EventGridMemberWorkTrajectoryDTO workTrajectoryDTO);
+
 
 }

--
Gitblit v1.7.1