Merge branch 'test' into 'master'

罗元桥

2021-07-26 021354080a0cc677e1483c7fd44dd6d6487c0321

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

@@ -103,4 +103,6 @@

    Map<String, Object> findUserById(Long userId);

    String getPopulationLabel(@Param("populationId") Long populationId);

}