From f0546e65bb67c903dfc4ef8f7ec86c476e2959cf Mon Sep 17 00:00:00 2001
From: liyuqian <201963020@qq.com>
Date: 星期二, 30 八月 2022 12:05:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
index 8a98951..bfad3c8 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SUserService.java
@@ -7,10 +7,7 @@
import com.hz.his.dto.user.UserLevelDto;
import com.hz.his.dto.user.card.UserCardDto;
import com.hz.his.dto.user.card.UserCardUsedDto;
-import com.hz.his.dto.user.coupon.GoodsCanUseCouponDto;
-import com.hz.his.dto.user.coupon.OrderCanUseCouponDto;
-import com.hz.his.dto.user.coupon.UserCanUseCouponDto;
-import com.hz.his.dto.user.coupon.UserCouponDto;
+import com.hz.his.dto.user.coupon.*;
import com.hz.his.dto.user.money.*;
import com.hz.his.dto.user.label.UserLabelDto;
import com.hz.his.dto.user.packages.UserPackageDto;
@@ -120,7 +117,7 @@
* 鑾峰彇鍟嗗搧鍙敤浼樻儬鍒�
* */
@PostMapping(value = "/goods/can/use/coupon")
- Result goodsCanUseCoupon(@RequestBody GoodsCanUseCouponDto goodsCanUseCouponDto);
+ Result goodsCanUseCoupon(@RequestBody GoodsUsedCouponDto goodsUsedCouponDto);
/**
* 鍒ゆ柇璁㈠崟鏄惁鍙敤璇ヤ紭鎯犲埜
--
Gitblit v1.8.0