Merge branch 'huacheng' into huacheng_test

101captain

2022-07-28 f0e91343445b1e568d1dfe705252d3e1201a18a7

 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(value = "loginAccount",required = false)String loginAccount){
        return this.comActAcidRecordService.fiveCountPlus(date,localCity,loginAccount);
    }

    /**