From b020f119176dcc1c60ec1c97bd03d9a3efe8b5fa Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 06 十二月 2023 19:14:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMarketActivityService.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMarketActivityService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMarketActivityService.java
index 5066ee7..6fcbdab 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMarketActivityService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMarketActivityService.java
@@ -38,4 +38,12 @@
     @PostMapping(value = "/market/activity/receiveCoupon")
     Result receiveCoupon(@RequestBody MarketActivityDto dto);
 
+    /** 瀹℃壒鍒楄〃 */
+    @PostMapping(value = "/market/activity/approve/list")
+    Result pendingApproveCoupon(@RequestBody MarketActivityDto dto);
+
+    /** 鎿嶄綔瀹℃壒棰嗗彇浼樻儬鍒� */
+    @PostMapping(value = "/market/activity/receive/approve/callback/admin")
+    Result receiveApproveCallbackAdmin(@RequestBody MarketActivityDto dto);
+
 }

--
Gitblit v1.8.0