Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-06-05 62ef4ba5d19e489e8cb0a87f0e95fbb945dd7fde

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventGridMemberGpsLogMapper.java

@@ -4,6 +4,7 @@
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.EventMapTrajectoryVO;
import com.panzhihua.service_grid.model.dos.EventGridMemberGpsLogDO;
@@ -34,4 +35,6 @@

    List<EventMapTrajectoryVO> getTrajectoryByApp(@Param("userId") Long userId);

    List<String> gridMemberWorkTrajectory(@Param("workTrajectoryDTO") EventGridMemberWorkTrajectoryDTO workTrajectoryDTO);

}