From 20c86767e4adeea95a131c8f5f8f7d29a67f83f7 Mon Sep 17 00:00:00 2001
From: Andru <769883346@qq.com>
Date: 星期二, 26 十二月 2023 17:34:32 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMarketActivityService.java |    4 ++--
 1 files changed, 2 insertions(+), 2 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 45e78aa..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,8 +38,8 @@
     @PostMapping(value = "/market/activity/receiveCoupon")
     Result receiveCoupon(@RequestBody MarketActivityDto dto);
 
-    /** 寰呭鎵逛紭鎯犲埜鍒楄〃 */
-    @PostMapping(value = "/market/activity/pending/approve/coupon/list")
+    /** 瀹℃壒鍒楄〃 */
+    @PostMapping(value = "/market/activity/approve/list")
     Result pendingApproveCoupon(@RequestBody MarketActivityDto dto);
 
     /** 鎿嶄綔瀹℃壒棰嗗彇浼樻儬鍒� */

--
Gitblit v1.8.0