From 1e65523fba19e99dbdf71d0a731a7747a2c9d4e0 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期五, 23 八月 2024 16:20:08 +0800
Subject: [PATCH] Merge branch 'master-xlk' into master-xlk-test

---
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SRepoActivityService.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SRepoActivityService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SRepoActivityService.java
index bdd1b76..f07aaad 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SRepoActivityService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SRepoActivityService.java
@@ -2,6 +2,7 @@
 
 import com.hx.resultTool.Result;
 import com.hz.his.dto.PageDto;
+import com.hz.his.dto.activity.RepoActivityDto;
 import com.hz.his.dto.coupon.CouponDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -14,7 +15,7 @@
 /**
  * 澶嶈喘娲诲姩service
  */
-@FeignClient(name="phis-provider",path = "/p-his-data",contextId = "repo-activity")
+@FeignClient(name="phi-platform-user",path = "/p-his-data",contextId = "repo-activity")
 public interface SRepoActivityService {
 
     /** 闂ㄥ簵鍒楄〃 */
@@ -32,4 +33,10 @@
     /** 浼樻儬鍒稿垪琛� */
     @PostMapping(value = "/repo/activity/coupon/list")
     Result couponList(@RequestBody CouponDto couponDto);
+
+    /** 妫�鏌ユ煡璇㈢敤鎴锋槸鍚︾鍚堝弬涓庡璐椿鍔� */
+    @PostMapping(value = "/repo/activity/check/user/can/join")
+    Result checkUserCanJoin(@RequestBody RepoActivityDto repoActivityDto);
+
+
 }

--
Gitblit v1.8.0