From 04c02fe5ad4589b7585e87fb207d21800d7b4b50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E6=A5=9A?= <823169880@qq.com>
Date: Tue, 15 Jan 2019 09:58:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/master' into
 hechu1

# Conflicts:
#	src/core/operation/Select.json
#	src/core/process/Process.java
---
 src/core/process/C_TeacherSearchStudent.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/core/process/C_TeacherSearchStudent.java b/src/core/process/C_TeacherSearchStudent.java
index 8fe27b0..6c90275 100644
--- a/src/core/process/C_TeacherSearchStudent.java
+++ b/src/core/process/C_TeacherSearchStudent.java
@@ -25,8 +25,10 @@ public class C_TeacherSearchStudent  {
         Map<String, Object> options = search.execute(null);
         List<String[]> result = (List<String[]>) options.get("result");
         String[] s = result.get(0);
-        StudentInfo.put("id",s[0]);
-        StudentInfo.put("name",s[2]);
+        StudentInfo.put("学号",s[0]);
+        StudentInfo.put("名字",s[2]);
+        StudentInfo.put("邮箱",s[3]);
+        StudentInfo.put("电话",s[4]);
         return StudentInfo;
     }
 }