From 8db98cedfb64d442e3fe66ff9dda94f8ad02f53c Mon Sep 17 00:00:00 2001
From: wlf <920607690@qq.com>
Date: Sat, 12 Jan 2019 12:22:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/master' into wlf

# Conflicts:
#	src/core/process/Process.java
---
 src/servlet/account/S_Register.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/servlet/account/S_Register.java b/src/servlet/account/S_Register.java
index 077cfa0..d19d6e0 100644
--- a/src/servlet/account/S_Register.java
+++ b/src/servlet/account/S_Register.java
@@ -21,9 +21,9 @@ public class S_Register extends HttpServlet {
         String name=request.getParameter("name");
         user_info.put("name",name);
         String e_mail=request.getParameter("e-mail");
-        user_info.put("e-mail",e_mail);
+        user_info.put("e_mail",e_mail);
         String phone_number=request.getParameter("phone-number");
-        user_info.put("phone-number",phone_number);
+        user_info.put("phone_number",phone_number);
         String password=request.getParameter("password");
         user_info.put("password",password);
         User user=null;