Merge branch 'huacheng' into huacheng_paicha

101captain

2022-04-28 a33990498e32fda774dacf849bfcd660c58da8e7

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

@@ -117,8 +117,8 @@
     * @return
     */
    @GetMapping("fiveCountPlus")
    public R fiveCountPlus(@RequestParam("date")String date){
        return this.comActAcidRecordService.fiveCountPlus(date);
    public R fiveCountPlus(@RequestParam("date")String date,@RequestParam("localCity")String localCity){
        return this.comActAcidRecordService.fiveCountPlus(date,localCity);
    }

    @GetMapping("/statics")