From 01ff6aada7e01064a3896e608e7b4500f9e76ed7 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期三, 15 十一月 2023 12:10:50 +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