From 262d511f52c7530f6f3ddbf595264f9880b4df4f Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期二, 14 十一月 2023 16:26:53 +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/SPhipUserService.java | 6 ++++++
phis-feign/src/main/java/com/hz/his/feign/service/marketing/MCommonService.java | 2 +-
2 files changed, 7 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);
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
index 8a4b5e2..837a5dd 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java
@@ -1,6 +1,7 @@
package com.hz.his.feign.service.platform;
import com.hx.resultTool.Result;
+import com.hz.his.dto.marketing.common.MarketingTotalDto;
import com.hz.his.dto.user.*;
import com.hz.his.dto.user.coupon.UserCouponDto;
import com.hz.his.dto.user.project.UserProjectDto;
@@ -134,4 +135,9 @@
@PostMapping(value = "/user/room/doctor/diagnosis/create")
Result userFamiliesRoomCreate(@RequestBody UserDoctorRoomDto userDoctorRoomDto);
+ /**
+ * 寮�鏀惧钩鍙�-杞彂鍒涘缓钀ラ攢鍔╂墜瀹℃牳
+ */
+ @PostMapping(value = "/user/common/approve/create")
+ Result commonApproveCreate(@RequestBody MarketingTotalDto marketingTotalDto);
}
\ No newline at end of file
--
Gitblit v1.8.0