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

tangxiaobao

2021-07-27 9c8735c70d86a31081340ca78bb2b538ed11a6e5

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

@@ -137,4 +137,8 @@
    List<CivilVillageStatisticsVO> getCivilScreenVillageList(@Param("communityId") Long communityId);

    ScreenDrawEventPopulationTotalVO getVillagePopulationTotal(@Param("villageId") Long villageId);

    List<Map<String,Object>> getMemberBuildName(@Param("userId") Long userId);

    Integer getPopulationByLabelCount(@Param("floor") String floor,@Param("villageId") Long villageId);
}