From 236ef1437170be16c99da4cffa39ffde54778f99 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:57:53 +0800 Subject: [PATCH 1/2] Merge remote-tracking branch 'remotes/origin/master' into hechu1 # Conflicts: # src/core/operation/Select.json # src/core/process/Process.java --- web/jsFile/upload_action.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/jsFile/upload_action.js b/web/jsFile/upload_action.js index c3214c9..906fe1c 100644 --- a/web/jsFile/upload_action.js +++ b/web/jsFile/upload_action.js @@ -4,7 +4,7 @@ $(document).ready(function () { $(document).off('change',showMsg).on('change','.true-select',showMsg) }) function sendFile() { - var fileData =new FormData; + var fileData =new FormData(); var Url4='testfrom.jsp'; var file=$('.true-select').files; if($('.true-select').val()=='') 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 2/2] 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 options = search.execute(null); List result = (List) 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; } }