From 254c2a69441dbd9ee9bcb1d134a05eb9da407d17 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 10 七月 2024 14:03:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 src/main/java/com/ycl/jxkg/service/UserService.java |   41 +++++++++++++++++++++++++++++++++++++----
 1 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/ycl/jxkg/service/UserService.java b/src/main/java/com/ycl/jxkg/service/UserService.java
index 28d420b..54b602f 100644
--- a/src/main/java/com/ycl/jxkg/service/UserService.java
+++ b/src/main/java/com/ycl/jxkg/service/UserService.java
@@ -1,14 +1,18 @@
 package com.ycl.jxkg.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ycl.jxkg.domain.form.RegisterForm;
+import com.ycl.jxkg.domain.form.UpdatePwdForm;
 import com.ycl.jxkg.domain.other.KeyValue;
-import com.ycl.jxkg.domain.User;
-import com.ycl.jxkg.viewmodel.admin.user.UserPageRequestVM;
+import com.ycl.jxkg.domain.entity.User;
+import com.ycl.jxkg.domain.vo.StudentVO;
+import com.ycl.jxkg.domain.vo.admin.user.UserPageRequestVO;
 import com.github.pagehelper.PageInfo;
 
 import java.util.List;
 
 
-public interface UserService extends BaseService<User> {
+public interface UserService extends IService<User> {
 
     /**
      * getUsers
@@ -74,7 +78,7 @@
      * @param requestVM requestVM
      * @return PageInfo<User>
      */
-    PageInfo<User> userPage(UserPageRequestVM requestVM);
+    PageInfo<User> userPage(UserPageRequestVO requestVM);
 
 
     /**
@@ -125,4 +129,33 @@
     User selectByWxOpenId(String wxOpenId);
 
     void changePicture(User user, String imagePath);
+
+    /**
+     * 鏁欏笀娉ㄥ唽
+     *
+     * @param form
+     */
+    void teacherRegister(RegisterForm form);
+
+    /**
+     * 瀛︾敓娉ㄥ唽
+     *
+     * @param form
+     */
+    void studentRegister(RegisterForm form);
+
+    /**
+     * 鏌ヨ鐝骇涓嬬幇鏈夌殑瀛︾敓
+     *
+     * @param classesId
+     * @return
+     */
+    List<StudentVO> classesStudent(Integer classesId);
+
+    /**
+     * 淇敼瀵嗙爜
+     *
+     * @param form
+     */
+    void updatePassword(UpdatePwdForm form);
 }

--
Gitblit v1.8.0