From 9a24e9adbc0477719fed960b879f8e5dcf870aba Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 22 Dec 2017 16:14:37 +0800
Subject: [PATCH] Merge branch 'master' of ssh://blit.7drlb.com:29418/screen_api_v2
---
src/main/java/com/moral/entity/Account.java | 45 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 44 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..935a924 100644
--- a/src/main/java/com/moral/entity/Account.java
+++ b/src/main/java/com/moral/entity/Account.java
@@ -2,28 +2,71 @@
import java.util.Date;
+import javax.persistence.Id;
+
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;
}
\ No newline at end of file
--
Gitblit v1.8.0