From f7e51fc7c91e474e5c0bcc79c47f074c0a59b5c3 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 11 十月 2023 20:03:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-account/src/main/java/com/dsh/account/mapper/TStudentMapper.java |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/cloud-server-account/src/main/java/com/dsh/account/mapper/TStudentMapper.java b/cloud-server-account/src/main/java/com/dsh/account/mapper/TStudentMapper.java
index 18c4266..f3bc468 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/mapper/TStudentMapper.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/mapper/TStudentMapper.java
@@ -1,8 +1,8 @@
 package com.dsh.account.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-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 org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -24,4 +24,12 @@
     List<TStudentDto> selectAll(@Param("item") StudentSearch search);
 
     TStudentDto selectWebOne(@Param("id") Integer id);
+
+    void createHistory(@Param("createHistoryDto") CreateHistoryDto createHistoryDto);
+
+    List<GetHistoryDto> getHistory();
+
+
+
+    Integer getGiftSelect(@Param("giftSearchDto")GiftSearchDto giftSearchDto);
 }

--
Gitblit v1.7.1