From dbfece7422e3ed4c1b314463df848d7e33a09f99 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期三, 07 十二月 2022 14:02:12 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ 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