解决代码被合并后删除问题

huanghongfa

2021-06-28 1a054c486c9037b7cb0bca5c4472c628d1d1c36c

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java

@@ -1269,6 +1269,14 @@
        //统计学历
        setCultureGroup(comActPopulationScreenVO, communityId);

        //查询网格数据
        List<EventGridStatisticsVO> gridStatisticsList = this.baseMapper.getEventScreenGridData(communityId);
        comActPopulationScreenVO.setGridStatisticsList(gridStatisticsList);

        //查询小区列表
        List<CivilVillageStatisticsVO> villageStatisticsList = this.baseMapper.getCivilScreenVillageList(communityId);
        comActPopulationScreenVO.setVillageStatisticsList(villageStatisticsList);

        return R.ok(comActPopulationScreenVO);
    }