From e125b445697a6b8c2b5cc5c57f31249c5088c1c9 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 26 Jan 2018 14:44:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/moral/entity/Account.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/moral/entity/Account.java b/src/main/java/com/moral/entity/Account.java
index 7e105bd..02eb11e 100644
--- a/src/main/java/com/moral/entity/Account.java
+++ b/src/main/java/com/moral/entity/Account.java
@@ -69,7 +69,9 @@
 	 * @mbggenerated  Thu Dec 07 16:17:21 CST 2017
 	 */
 	private Date expireTime;
-	
+
+	private String userName;
+
 	@Transient
 	private Organization organization;
 

--
Gitblit v1.8.0