From 1b9a01bf5000714b08a75a50dd1f5f3eab65d888 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 08 十二月 2023 17:18:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-other/src/main/java/com/dsh/other/feignclient/activity/UserCouponClient.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/cloud-server-other/src/main/java/com/dsh/other/feignclient/activity/UserCouponClient.java b/cloud-server-other/src/main/java/com/dsh/other/feignclient/activity/UserCouponClient.java
index 32b54ba..6fc7831 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/feignclient/activity/UserCouponClient.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/feignclient/activity/UserCouponClient.java
@@ -1,5 +1,6 @@
 package com.dsh.other.feignclient.activity;
 
+import com.dsh.other.feignclient.activity.model.QueryUserCouponByIdAndUserId;
 import com.dsh.other.feignclient.activity.model.UserCoupon;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -14,14 +15,16 @@
 
     /**
      * 根据id获取用户优惠券数据
-     * @param id
+     *
+     * @param queryUserCouponByIdAndUserId
      * @return
      */
     @PostMapping("/userCoupon/queryUserCouponById")
-    UserCoupon queryUserCouponById(Long id);
+    UserCoupon queryUserCouponById(QueryUserCouponByIdAndUserId queryUserCouponByIdAndUserId);
 
     /**
      * 修改优惠券数据
+     *
      * @param userCoupon
      */
     @PostMapping("/userCoupon/updateUserCoupon")

--
Gitblit v1.7.1