From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventGridMemberGpsLogMapper.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventGridMemberGpsLogMapper.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventGridMemberGpsLogMapper.java
index 313746d..96c4612 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventGridMemberGpsLogMapper.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventGridMemberGpsLogMapper.java
@@ -1,18 +1,18 @@
package com.panzhihua.service_grid.dao;
+import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.grid.EventGridMemberWorkTrajectoryDTO;
import com.panzhihua.common.model.dtos.grid.PageEventGridMemberGpsLogDTO;
+import com.panzhihua.common.model.vos.grid.EventGridMemberGpsLogVO;
import com.panzhihua.common.model.vos.grid.EventMapTrajectoryVO;
import com.panzhihua.service_grid.model.dos.EventGridMemberGpsLogDO;
-import com.panzhihua.common.model.vos.grid.EventGridMemberGpsLogVO;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
/**
* DAO
@@ -31,10 +31,12 @@
* @param pageEventGridMemberGpsLogDTO
* @return
*/
- IPage<EventGridMemberGpsLogVO> findByPage(Page page, @Param("pageEventGridMemberGpsLogDTO") PageEventGridMemberGpsLogDTO pageEventGridMemberGpsLogDTO);
+ IPage<EventGridMemberGpsLogVO> findByPage(Page page,
+ @Param("pageEventGridMemberGpsLogDTO") PageEventGridMemberGpsLogDTO pageEventGridMemberGpsLogDTO);
List<EventMapTrajectoryVO> getTrajectoryByApp(@Param("userId") Long userId);
- List<String> gridMemberWorkTrajectory(@Param("workTrajectoryDTO") EventGridMemberWorkTrajectoryDTO workTrajectoryDTO);
+ List<String>
+ gridMemberWorkTrajectory(@Param("workTrajectoryDTO") EventGridMemberWorkTrajectoryDTO workTrajectoryDTO);
}
--
Gitblit v1.7.1