From ebdd612ec22af566fa4a0707fef15e5e0a89e6fb Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 23 四月 2024 15:03:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java | 6 ++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipTreatService.java | 3 ++-
2 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipTreatService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipTreatService.java
index 8c741c2..d680359 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipTreatService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipTreatService.java
@@ -1,5 +1,6 @@
package com.hz.his.feign.service.platform;
+import com.alibaba.fastjson.JSONObject;
import com.hx.resultTool.Result;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
@@ -27,5 +28,5 @@
/** 鎵归噺鍒涘缓娌荤枟鍗� */
@PostMapping(value = "/treat/batch/add")
- Result batchAdd(@RequestBody String dataJson);
+ Result batchAdd(@RequestBody JSONObject dataJson);
}
\ No newline at end of file
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 549acc7..2b2e144 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
@@ -146,4 +146,10 @@
*/
@PostMapping(value = "/user/arrive/edit")
Result arriveEdit(@RequestBody com.alibaba.fastjson.JSONObject data);
+
+ /**
+ * 寮�鏀惧钩鍙�-鍛樺伐鑾峰彇鑾峰彇鐭俊鍐呭閾炬帴
+ */
+ @PostMapping(value = "/user/acquisition/get/link")
+ Result getUserAcquisitionLink(@RequestBody UserParamDto userParamDto);
}
\ No newline at end of file
--
Gitblit v1.8.0