From f0e91343445b1e568d1dfe705252d3e1201a18a7 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 28 七月 2022 18:02:36 +0800
Subject: [PATCH] Merge branch 'huacheng' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActAcidRecordApi.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActAcidRecordApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActAcidRecordApi.java
index 7d2c436..48b5b93 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActAcidRecordApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActAcidRecordApi.java
@@ -122,7 +122,7 @@
     @ApiOperation(value = "7项常规统计",response = FiveCount.class)
     @GetMapping("fiveCountPlus")
     public R fiveCountPlus(@RequestParam("date")String date,@RequestParam("localCity") String localCity){
-        return this.communityService.comActAcidRecordFiveCountPlus(date,localCity);
+        return this.communityService.comActAcidRecordFiveCountPlus(date,localCity,null);
     }
     @ApiOperation(value = "新版查看详情",response = ComActAcidRecordVO.class)
     @GetMapping("/detailByApp")

--
Gitblit v1.7.1