From 5bb9492f10f08c8f2ab5485d25ae9e2bbf3a3849 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 07 六月 2024 10:57:55 +0800
Subject: [PATCH] Merge branch 'master-fwq-爆款活动2.0' into master-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderActivityService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderActivityService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderActivityService.java
index e08d0e7..44906a1 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderActivityService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderActivityService.java
@@ -27,6 +27,6 @@
      * 鏍规嵁娲诲姩缂栫爜鏌ヨ璧犻�佺殑澧炲�奸噾
      */
     @PostMapping(value = "/order/activity/increment/money")
-    Result getActivityIncrement(@RequestBody OrderActivityVo orderActivityVo);
+    Result getActivityReturn(@RequestBody OrderActivityVo orderActivityVo);
 
 }

--
Gitblit v1.8.0