From ce05f93873f62806ebc52952e777cb3f9d640eb5 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 31 五月 2024 16:36:40 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java | 6 +++++-
phis-feign/src/main/java/com/hz/his/vo/coupon/CouponReceiveVo.java | 15 +++++++++++++++
2 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java
index 01f8bca..c53c4c5 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCouponService.java
@@ -162,6 +162,10 @@
@PostMapping(value = "/coupon/birthday/list/user")
Result userBirthDayCouponList(@RequestBody(required = false) CouponDto dto);
-
+ /**
+ * 鑾峰彇浼樻儬鍒搁鍙栬鍒欏垪琛�
+ */
+ @PostMapping(value = "/coupon/receive/rule/list")
+ Result getReceiveRuleList();
}
diff --git a/phis-feign/src/main/java/com/hz/his/vo/coupon/CouponReceiveVo.java b/phis-feign/src/main/java/com/hz/his/vo/coupon/CouponReceiveVo.java
new file mode 100644
index 0000000..30f58c4
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/vo/coupon/CouponReceiveVo.java
@@ -0,0 +1,15 @@
+package com.hz.his.vo.coupon;
+
+import lombok.Data;
+
+/**
+ * 浼樻儬鍒搁鍙栬鍒�
+ * */
+@Data
+public class CouponReceiveVo {
+ /**瑙勫垯鏍囪瘑*/
+ private String id;
+ /**瑙勫垯鍚嶇О*/
+ private String name;
+
+}
--
Gitblit v1.8.0