From 85d4b0a96e53f57d9598a89f46029e1fb7d074df Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期二, 01 十一月 2022 16:06:39 +0800
Subject: [PATCH] Merge branch 'local_20221024' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ComActAcidRecordApi.java | 6 +++++-
1 files changed, 5 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 613a75b..b580850 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,this.getLoginUserInfo().getAccount());
+ return this.communityService.comActAcidRecordFiveCountPlus(date,localCity,null);
}
@ApiOperation(value = "新版查看详情",response = ComActAcidRecordVO.class)
@GetMapping("/detailByApp")
@@ -139,4 +139,8 @@
public R charts(@RequestParam("date")String date,@RequestParam("localCity")String localCity){
return this.communityService.charts(date,localCity);
}
+ @GetMapping("/checkCommit")
+ public R checkCommit(){
+ return this.communityService.checkCommit(this.getUserId());
+ }
}
--
Gitblit v1.7.1