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

# Conflicts:
#	src/core/operation/Select.json
#	src/core/process/Process.java
---
 web/login.jsp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/login.jsp b/web/login.jsp
index 48b257a..658a59e 100644
--- a/web/login.jsp
+++ b/web/login.jsp
@@ -53,7 +53,7 @@
                    placeholder="请输入电话">
             <input class="register-input-text check-password-text" type="password" name="password-check"
                    placeholder="请确认密码">
-            <select class="id-check" name="usertype">
+            <select class="id-check" name="userType">
                 <option value="">身份</option>
                 <option value="student">学生</option>
                 <option value="teacher">老师</option>