From d89d4a28653657528dc0718f1aa55e1c84ad1e6f Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 19 四月 2022 10:36:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/lyq_battery_shop' into lyq_battery_shop

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComBatteryCommodityActivityService.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComBatteryCommodityActivityService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComBatteryCommodityActivityService.java
index b541572..65c274e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComBatteryCommodityActivityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComBatteryCommodityActivityService.java
@@ -2,6 +2,7 @@
 
 import com.panzhihua.common.model.dtos.common.*;
 import com.panzhihua.common.model.vos.R;
+import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * title: 电动车商城-商家活动表表服务接口
@@ -59,11 +60,12 @@
      * description  detailById  查询详情
      *
      * @param id 主键id
+     * @param userId 用户id
      * @return 详情数据
      * @author lyq
      * @date 2022-03-29 13:17:40
      */
-    R detailById(Long id);
+    R detailById(Long id,Long userId);
 
     /**
      * description  queryByPage  查询列表
@@ -83,4 +85,5 @@
      */
     R updateStatus(Long id,Integer status);
 
+
 }

--
Gitblit v1.7.1