From 41c07e4558ed3a1cbdda0711f78cd3a812c06829 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期四, 28 九月 2023 18:34:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java b/cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java
index 304104c..2975b15 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/TAppUserService.java
@@ -3,11 +3,9 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.dsh.account.dto.SelectDto;
 import com.dsh.account.entity.TAppUser;
-import com.dsh.account.model.AddAppUserVo;
-import com.dsh.account.model.JoinPlayPaiVo;
-import com.dsh.account.model.LoginSMSCodeVo;
-import com.dsh.account.model.LoginWeChatVo;
+import com.dsh.account.model.*;
 import com.dsh.account.model.query.appUserQuery.QueryAppUser;
+import com.dsh.account.model.vo.DetailsListVo;
 import com.dsh.account.model.vo.QueryAppUserVO;
 import com.dsh.account.model.vo.classDetails.CourseVenue;
 import com.dsh.account.model.vo.classDetails.classInsVo.ClassInfoVo;
@@ -17,6 +15,7 @@
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -141,5 +140,12 @@
 
     List<QueryAppUserVO> listAll(QueryAppUser query);
 
+    Map<String,Object> weeksOfCourseDetailsList(Integer appUserId, Integer stuId, String time, Integer storeId,String lon,String lat);
+
+
     List<SelectDto> getSelects(List<Integer> studentIds);
+
+    Object changeState(AdvertisementChangeStateDTO dto);
+
+    List<TAppUser> queryAPPUserByNameAndPhone(AppUserByNameAndPhoneDTO dto);
 }

--
Gitblit v1.7.1