Merge remote-tracking branch 'remotes/origin/master' into hechu1

# Conflicts: # src/core/process/C_TeacherSearchStudent.java # web/jsFile/upload_action.js
6 years ago · 1e7eb32f85
parent f52e6bd7ef
commit 1e7eb32f85
1 changed files with 1 additions and 1 deletions
--- 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;
 %>