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

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

diff --git a/src/servlet/account/S_Register.java b/src/servlet/account/S_Register.java
index 20d558c..cbec93b 100644
--- a/src/servlet/account/S_Register.java
+++ b/src/servlet/account/S_Register.java
@@ -32,6 +32,8 @@ public class S_Register extends HttpServlet {
         } catch (GExcptSQL gExcptSQL) {
             gExcptSQL.printStackTrace();
         }
+        request.getSession().setAttribute("User",user);
         request.getRequestDispatcher("/login.jsp").forward(request,response);
+
     }
 }
\ No newline at end of file