From a1557f3f07287c86e8a4a408f03ba19993e5a48c Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 25 十月 2023 09:41:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/service/TStudentService.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/TStudentService.java b/cloud-server-account/src/main/java/com/dsh/account/service/TStudentService.java
index 008f808..9fce2ad 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/TStudentService.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/TStudentService.java
@@ -1,17 +1,14 @@
package com.dsh.account.service;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.dsh.account.dto.CreateHistoryDto;
-import com.dsh.account.dto.GetHistoryDto;
-import com.dsh.account.dto.StudentSearch;
-import com.dsh.account.dto.TStudentDto;
+import com.dsh.account.dto.*;
+import com.dsh.account.entity.GiftSearchDto;
import com.dsh.account.entity.TStudent;
import com.dsh.account.feignclient.competition.model.PurchaseRecordVo;
import com.dsh.account.feignclient.course.model.RecordAppoint;
import com.dsh.account.feignclient.other.model.StoreDetailList;
import com.dsh.account.feignclient.other.model.StoreInfo;
import com.dsh.account.feignclient.other.model.SysNotice;
-import com.dsh.account.model.vo.classDetails.AppointmentRecordVo;
import com.dsh.account.model.vo.classDetails.ClasspaymentRequest;
import com.dsh.account.model.vo.classDetails.StuEditInfoReq;
import com.dsh.account.model.vo.classDetails.classInsVo.ClassDetailsInsVo;
@@ -26,6 +23,7 @@
import com.dsh.account.util.ResultUtil;
import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -113,4 +111,9 @@
void createHistory(CreateHistoryDto createHistoryDto);
List<GetHistoryDto> getHistory();
+
+
+ Integer getGiftSelect(GiftSearchDto giftSearchDto);
+
+ List<Map<String, Object>> queryCom(Integer id);
}
--
Gitblit v1.7.1