Merge remote-tracking branch 'origin/huacheng_zts' into huacheng_zZ

张天森

2022-07-19 feb98a932adc9dab19fa538dbad743c63af0e621

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

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

    /**