From 1cb12391db6154f2d1a8fdf8e0506fe3f3eb2f15 Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期日, 08 十月 2023 16:19:34 +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, 14 insertions(+), 4 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 4605680..bf46cef 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
@@ -2,13 +2,10 @@
import com.dsh.course.dto.CreateHistoryDto;
import com.dsh.course.dto.GetHistoryDto;
-import com.dsh.course.feignClient.account.model.QueryAppUser;
-import com.dsh.course.feignClient.account.model.QueryAppUserVO;
+import com.dsh.course.feignClient.account.model.*;
import com.dsh.course.dto.StudentSearch;
import com.dsh.course.dto.TStudentDto;
-import com.dsh.course.feignClient.account.model.QueryByNamePhone;
-import com.dsh.course.feignClient.account.model.TAppUser;
import com.dsh.course.feignClient.other.model.SiteChangeStateVO;
import com.dsh.guns.modular.system.model.AdvertisementChangeStateDTO;
import com.dsh.guns.modular.system.model.AppUserByNameAndPhoneDTO;
@@ -19,6 +16,7 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestBody;
+import java.util.HashMap;
import java.util.List;
@FeignClient("mb-cloud-account")
@@ -95,4 +93,16 @@
List<GetHistoryDto> getHisory();
@PostMapping("/student/giftSelect")
List<SelectDto> giftSelect(@RequestBody GiftSearchDto giftSearchDto);
+
+ @PostMapping("/student/getUserPt")
+ List<Integer> getUserPt(List<Integer> ids);
+
+ @PostMapping("/student/queryFee")
+ HashMap<String, Object> queryFee(QueryDataFee queryDataFee);
+
+ @PostMapping("/student/queryUserAge")
+ HashMap<String, Object> queryUserAge();
+
+
+
}
--
Gitblit v1.7.1