From d643b843cc794d8f59c4ecd04bda2b9d35e5b22a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 28 十一月 2023 19:54:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-management/src/main/java/com/dsh/course/feignClient/account/AppUserClient.java |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/AppUserClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/AppUserClient.java
index 4d72852..8977bf9 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/AppUserClient.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/account/AppUserClient.java
@@ -8,11 +8,13 @@
 import com.dsh.course.dto.StudentSearch;
 import com.dsh.course.dto.TStudentDto;
 import com.dsh.course.feignClient.other.model.SiteChangeStateVO;
-import com.dsh.guns.modular.system.model.AdvertisementChangeStateDTO;
-import com.dsh.guns.modular.system.model.AppUserByNameAndPhoneDTO;
-import com.dsh.guns.modular.system.model.TStudent;
+import com.dsh.guns.modular.system.model.*;
 import com.dsh.guns.modular.system.model.dto.GiftSearchDto;
 import com.dsh.guns.modular.system.model.dto.SelectDto;
+import com.dsh.guns.modular.system.util.ResultUtil;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -25,6 +27,16 @@
 
 
     /**
+     * 根据介绍有礼id查询当前活动参与次数
+     */
+    @PostMapping("/base/appUser/getActivityPeoples")
+    Integer getActivityPeoples(@RequestBody Integer activityId);
+    /**
+     * 介绍有礼 -- 参与用户列表
+     */
+    @PostMapping("/base/appUser/queryIntroduceAll")
+    List<IntroduceUser> queryIntroduceAll(@RequestBody IntroduceUserQuery query);
+    /**
      * 根据用户姓名和电话模糊查询
      */
     @PostMapping("/base/appUser/queryAPPUserByNameAndPhone")

--
Gitblit v1.7.1