From 05e9aa8a610932d706d48257a36e95cec9de39fa Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期四, 22 二月 2024 19:22:37 +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/marketing/MCommonService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/marketing/MCommonService.java b/phis-feign/src/main/java/com/hz/his/feign/service/marketing/MCommonService.java
index 16bc710..373b6e1 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/marketing/MCommonService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/marketing/MCommonService.java
@@ -16,7 +16,7 @@
      * 缁熶竴鐢宠瀹℃牳鎺ュ彛
      */
     @PostMapping(value = "/common/apply")
-    Result applyOrderDiscount(@RequestBody MarketingTotalDto marketingTotalDto);
+    Result commonApply(@RequestBody MarketingTotalDto marketingTotalDto);
 
 
 

--
Gitblit v1.8.0