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 | 130 ++++++++++++++++---------------------------
1 files changed, 48 insertions(+), 82 deletions(-)
diff --git a/src/main/java/com/moral/entity/Account.java b/src/main/java/com/moral/entity/Account.java
index 813c62d..935a924 100644
--- a/src/main/java/com/moral/entity/Account.java
+++ b/src/main/java/com/moral/entity/Account.java
@@ -2,105 +2,71 @@
import java.util.Date;
-public class Account {
- private Integer id;
+import javax.persistence.Id;
+import lombok.Data;
+
+@Data
+public class Account {
+ /**
+ * 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;
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public String getAccountName() {
- return accountName;
- }
-
- public void setAccountName(String accountName) {
- this.accountName = accountName;
- }
-
- public String getPassword() {
- return password;
- }
-
- public void setPassword(String password) {
- this.password = password;
- }
-
- public Integer getOrganizationId() {
- return organizationId;
- }
-
- public void setOrganizationId(Integer organizationId) {
- this.organizationId = organizationId;
- }
-
- public String getEmail() {
- return email;
- }
-
- public void setEmail(String email) {
- this.email = email;
- }
-
- public String getMobile() {
- return mobile;
- }
-
- public void setMobile(String mobile) {
- this.mobile = mobile;
- }
-
- public String getWeixin() {
- return weixin;
- }
-
- public void setWeixin(String weixin) {
- this.weixin = weixin;
- }
-
- public String getIsDelete() {
- return isDelete;
- }
-
- public void setIsDelete(String isDelete) {
- this.isDelete = isDelete;
- }
-
- public Date getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
-
- public Date getExpireTime() {
- return expireTime;
- }
-
- public void setExpireTime(Date expireTime) {
- this.expireTime = expireTime;
- }
}
\ No newline at end of file
--
Gitblit v1.8.0