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

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ScreenPopulationApi.java

@@ -1,14 +1,14 @@
package com.panzhihua.service_community.api;

import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.service.ComMngPopulationService;
import com.panzhihua.service_community.service.ScreenWorkService;
import javax.annotation.Resource;

import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_community.service.ComMngPopulationService;

/**
 * @author xyh
@@ -23,11 +23,12 @@

    /**
     * 大屏人口查询
     * 
     * @param communityId
     * @return
     */
    @GetMapping("/statistic")
    R statistic(@RequestParam("communityId")Long communityId){
    R statistic(@RequestParam("communityId") Long communityId) {

        return R.ok(comMngPopulationService.screenStatistic(communityId));
    }