From 1e7eb32f855284c78c6d7b4a5e5f68febcbf3d94 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 15:40:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/master' into
 hechu1

# Conflicts:
#	src/core/process/C_TeacherSearchStudent.java
#	web/jsFile/upload_action.js
---
 web/home.jsp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/home.jsp b/web/home.jsp
index d2bc92d..56f7174 100644
--- a/web/home.jsp
+++ b/web/home.jsp
@@ -36,7 +36,7 @@
     String type=user.getType();
     pageContext.setAttribute("userType",type);
     Condition condition=user.getCondition();
-    //List<Process> pList=condition.getProcesses();
+    List<Process> pList=condition.getProcesses();
     int length=0;
     int index=0;
 %>