From 95dd7d30c396ddc175a794db43216f995c067e5d Mon Sep 17 00:00:00 2001
From: Andru <769883346@qq.com>
Date: 星期一, 20 十一月 2023 10:24:48 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
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 451ecd2..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,9 +1,11 @@
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;
+import com.hz.his.dto.user.room.UserDoctorRoomDto;
import net.sf.json.JSONObject;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
@@ -119,11 +121,23 @@
* 寮�鏀惧钩鍙�-鍙戦�佽幏瀹㈡秷鎭坊鍔犲鎴�
*/
@PostMapping(value = "/user/acquisition/sent")
- Result sentUserAcquisitionSMS(@RequestBody UserUnionDto userParamDto);
+ Result sentUserAcquisitionSMS(@RequestBody UserParamDto userParamDto);
/**
* 寮�鏀惧钩鍙�-鑾峰彇鐢ㄦ埛鑾峰鏁版嵁璁板綍
*/
@PostMapping(value = "/user/acquisition/list")
Result getUserAcquisitionList(@RequestBody UserParamDto userParamDto);
+
+ /**
+ * 寮�鏀惧钩鍙�-鐢ㄦ埛绉戝鐐硅瘖鏂板
+ */
+ @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