From b9baa2c78a067e9e67c7c824a28c8fd36682ecc8 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Tue, 08 May 2018 13:58:14 +0800
Subject: [PATCH] test

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

diff --git a/src/main/java/com/moral/entity/Account.java b/src/main/java/com/moral/entity/Account.java
index c94b61e..86f78d2 100644
--- a/src/main/java/com/moral/entity/Account.java
+++ b/src/main/java/com/moral/entity/Account.java
@@ -1,29 +1,89 @@
 package com.moral.entity;
 
+import java.util.Arrays;
 import java.util.Date;
+import java.util.List;
+
+import javax.persistence.Id;
+import javax.persistence.Transient;
 
 import lombok.Data;
 
 @Data
 public class Account {
-    private Integer id;
+    /**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column account.id
+	 * @mbggenerated  Thu Dec 07 16:17:21 CST 2017
+	 */
+	@Id
+	private Integer id;
 
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column account.account_name
+	 * @mbggenerated  Thu Dec 07 16:17:21 CST 2017
+	 */
 	private String accountName;
 
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column account.password
+	 * @mbggenerated  Thu Dec 07 16:17:21 CST 2017
+	 */
 	private String password;
 
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column account.organization_id
+	 * @mbggenerated  Thu Dec 07 16:17:21 CST 2017
+	 */
 	private Integer organizationId;
 
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column account.email
+	 * @mbggenerated  Thu Dec 07 16:17:21 CST 2017
+	 */
 	private String email;
 
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column account.mobile
+	 * @mbggenerated  Thu Dec 07 16:17:21 CST 2017
+	 */
 	private String mobile;
 
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column account.weixin
+	 * @mbggenerated  Thu Dec 07 16:17:21 CST 2017
+	 */
 	private String weixin;
 
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column account.is_delete
+	 * @mbggenerated  Thu Dec 07 16:17:21 CST 2017
+	 */
 	private String isDelete;
 
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column account.create_time
+	 * @mbggenerated  Thu Dec 07 16:17:21 CST 2017
+	 */
 	private Date createTime;
 
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column account.expire_time
+	 * @mbggenerated  Thu Dec 07 16:17:21 CST 2017
+	 */
 	private Date expireTime;
 
+	private String userName;
+	@Transient
+	private JwtTokenVersion jwtTokenVersion;
+	@Transient
+    private List<Role> Roles;
+	// TODO ������������
+	public List<Role> getRoles(){
+		Role role = new Role();
+		role.setName("temp");
+		return Arrays.asList(role);
+	}
+	@Transient
+	private Organization organization;
+
 }
\ No newline at end of file

--
Gitblit v1.8.0