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

CeDo

2021-06-03 79f76bd108aae3a6bb0c7b66150e1ac69a6563a3

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridMemberGpsLogServiceImpl.java

@@ -101,4 +101,14 @@
        return R.fail();
    }

    /**
     * 根据网格员id查询今日轨迹
     * @param userId    网格员id
     * @return  网格员今日轨迹
     */
    @Override
    public R getTrajectoryByApp(Long userId){
        return R.ok(this.baseMapper.getTrajectoryByApp(userId));
    }

}