From 619bcd6c8cc1672b82db763779fcf98c563a3ccb Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期三, 04 八月 2021 17:11:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSwPatrolRecordApi.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSwPatrolRecordApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSwPatrolRecordApi.java
index 80835c8..c3016ed 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSwPatrolRecordApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComSwPatrolRecordApi.java
@@ -99,8 +99,8 @@
* @return 安全工作记录详情查询结果
*/
@GetMapping("/safetyWorkRecord/detail")
- public R detailSafetyWorkRecord(@RequestParam(value = "safetyWorkRecordId") Long safetyWorkRecordId) {
- return comSwSafetyWorkRecordService.detailSafetyWorkRecord(safetyWorkRecordId);
+ public R detailSafetyWorkRecord(@RequestParam(value = "safetyWorkRecordId") Long safetyWorkRecordId, @RequestParam(value = "communityId", required = false) Long communityId) {
+ return comSwSafetyWorkRecordService.detailSafetyWorkRecord(safetyWorkRecordId, communityId);
}
/**
@@ -110,8 +110,8 @@
* @return 安全工作记录详情查询结果
*/
@GetMapping("/safetyWorkRecord/detailByPrId")
- public R detailSafetyWorkRecordByPrId(@RequestParam(value = "patrolRecordId") Long patrolRecordId) {
- return comSwSafetyWorkRecordService.detailSafetyWorkRecordByPrId(patrolRecordId);
+ public R detailSafetyWorkRecordByPrId(@RequestParam(value = "patrolRecordId") Long patrolRecordId, @RequestParam(value = "communityId", required = false) Long communityId) {
+ return comSwSafetyWorkRecordService.detailSafetyWorkRecordByPrId(patrolRecordId, communityId);
}
/**
--
Gitblit v1.7.1