From d643b843cc794d8f59c4ecd04bda2b9d35e5b22a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 28 十一月 2023 19:54:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/UserConponClient.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/UserConponClient.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/UserConponClient.java
index 0559521..44f1a3a 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/UserConponClient.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/UserConponClient.java
@@ -15,7 +15,7 @@
      * 查询注册赠送优惠券 判断当前优惠券限领数量
      */
     @PostMapping("/coupon/queryCouponByUser/{userId}")
-    public List<Integer> queryCouponByUser(@PathVariable("userId") Integer userId);
+    public List<Long> queryCouponByUser(@PathVariable("userId") Integer userId);
 
     @PostMapping("/base/userConpon/getStuOfConpons")
     public List<CouponStuAvailableVo> queryUserWithConponList(@RequestParam("appUserId") Integer appUserId);

--
Gitblit v1.7.1