From 937daff0ebc1aa16a852d5a86434ab1994d8a02d Mon Sep 17 00:00:00 2001
From: 胡仁荣 <897853850@qq.com>
Date: 星期一, 11 九月 2023 10:41:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/qxueyou/scc/controller/TeacherController.java |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/qxueyou/scc/controller/TeacherController.java b/src/main/java/com/qxueyou/scc/controller/TeacherController.java
index 78c17ab..2564cdb 100644
--- a/src/main/java/com/qxueyou/scc/controller/TeacherController.java
+++ b/src/main/java/com/qxueyou/scc/controller/TeacherController.java
@@ -18,7 +18,7 @@
 import com.qxueyou.scc.user.model.UserTeacher;
 
 /**
- * 教师管理控制器
+ * 鏁欏笀绠$悊鎺у埗鍣�
  * 
  * @author chenjunliang
  *
@@ -30,14 +30,14 @@
 	private ITeacherService teacherService;
 
 	/**
-	 * 教师管理显示列表
+	 * 鏁欏笀绠$悊鏄剧ず鍒楄〃
 	 * 
 	 * @param pageSize
-	 *            每页显示几条
+	 *            姣忛〉鏄剧ず鍑犳潯
 	 * @param pageNum
-	 *            页码
+	 *            椤电爜
 	 * @param keyword
-	 *            索搜关键字
+	 *            绱㈡悳鍏抽敭瀛�
 	 */
 	@GetMapping(value = "lstTeacher")
 	public Result lstTeacher(String keyword, Integer pageSize, Integer pageNum) {
@@ -55,18 +55,18 @@
 	}
 
 	/**
-	 * 教师管理新增/更新
+	 * 鏁欏笀绠$悊鏂板/鏇存柊
 	 * 
 	 * @param teacherId
 	 * 
 	 * @param teacherName
-	 *            老师名称
+	 *            鑰佸笀鍚嶇О
 	 * @param account
-	 *            账号
+	 *            璐﹀彿
 	 * @param password
-	 *            密码
+	 *            瀵嗙爜
 	 * @param mobilePhone
-	 *            手机
+	 *            鎵嬫満
 	 */
 	@PostMapping(value = "addOrUpdate")
 	public Result addOrUpdate(String teacherId, String teacherName, String account, String password, String mobilePhone,
@@ -80,10 +80,10 @@
 	}
 
 	/**
-	 * 教师管理 删除教师
+	 * 鏁欏笀绠$悊 鍒犻櫎鏁欏笀
 	 * 
 	 * @param teacherIds
-	 *            老师ids
+	 *            鑰佸笀ids
 	 */
 	@PostMapping(value = "delete")
 	public Result deleteTeacher(String teacherIds) {
@@ -91,7 +91,7 @@
 	}
 
 	/**
-	 * 教师管理导出
+	 * 鏁欏笀绠$悊瀵煎嚭
 	 */
 	@GetMapping(value = "exportTeacher")
 	public Result export(HttpServletResponse response) {
@@ -99,7 +99,7 @@
 	}
 
 	/**
-	 * 教室管理导入
+	 * 鏁欏绠$悊瀵煎叆
 	 */
 	@GetMapping(value = "importTeacher")
 	public Result importTeacher() {
@@ -107,7 +107,7 @@
 	}
 
 	/**
-	 * 新增班级获取教师列表
+	 * 鏂板鐝骇鑾峰彇鏁欏笀鍒楄〃
 	 */
 	@GetMapping(value = "getLstTeacher4Cls")
 	public Result getLstTeacher4Cls() {
@@ -117,7 +117,7 @@
 	}
 	
 	/**
-	 * 新增班级获取教师列表
+	 * 鏂板鐝骇鑾峰彇鏁欏笀鍒楄〃
 	 */
 	@GetMapping(value = "getTeacherbyUserId")
 	public Result getTeacherbyUserId(String userId) {

--
Gitblit v1.8.0