From e94a80ae3d9733eb2d6a5d9bcbd50a624f058caa Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期三, 19 十月 2022 17:39:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComBatteryCommodityOrderCollageTeamController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComBatteryCommodityOrderCollageTeamController.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComBatteryCommodityOrderCollageTeamController.java
index 49e5542..f35c531 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComBatteryCommodityOrderCollageTeamController.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComBatteryCommodityOrderCollageTeamController.java
@@ -85,8 +85,8 @@
* @date 2022-03-29 16:06:55
*/
@GetMapping("/detail")
- public R detailById(@RequestParam("id") Long id) {
- return this.comBatteryCommodityOrderCollageTeamService.detailById(id);
+ public R detailById(@RequestParam("id") Long id,@RequestParam("userId") Long userId) {
+ return this.comBatteryCommodityOrderCollageTeamService.detailById(id,userId);
}
/**
--
Gitblit v1.7.1