From 111a9da81d0f7cab8f9c1de643505b9595e628cd Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 02 八月 2021 13:40:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index cff8933..7ee14de 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -3823,7 +3823,7 @@
      * @return 安全工作记录详情查询结果
      */
     @GetMapping("/patrolRecord/safetyWorkRecord/detail")
-    R detailSafetyWorkRecord(@RequestParam(value = "safetyWorkRecordId") Long safetyWorkRecordId);
+    R detailSafetyWorkRecord(@RequestParam(value = "safetyWorkRecordId") Long safetyWorkRecordId, @RequestParam(value = "communityId", required = false) Long communityId);
 
     /**
      * 根据巡查记录id查询安全工作记录详情
@@ -3832,7 +3832,7 @@
      * @return 安全工作记录详情查询结果
      */
     @GetMapping("/patrolRecord/safetyWorkRecord/detailByPrId")
-    R detailSafetyWorkRecordByPrId(@RequestParam(value = "patrolRecordId") Long patrolRecordId);
+    R detailSafetyWorkRecordByPrId(@RequestParam(value = "patrolRecordId") Long patrolRecordId, @RequestParam(value = "communityId", required = false) Long communityId);
 
     /**
      * 分页查询隐患报告

--
Gitblit v1.7.1