From 6fab467ce6ddad58de462f0094f86b044dfee94c Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 10 Aug 2020 11:50:54 +0800
Subject: [PATCH] 更新天气预测
---
src/main/java/com/moral/entity/Account.java | 141 ++++++++++++++++++++--------------------------
1 files changed, 62 insertions(+), 79 deletions(-)
diff --git a/src/main/java/com/moral/entity/Account.java b/src/main/java/com/moral/entity/Account.java
index 813c62d..18e66a6 100644
--- a/src/main/java/com/moral/entity/Account.java
+++ b/src/main/java/com/moral/entity/Account.java
@@ -1,106 +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;
- public Integer getId() {
- return id;
+ private String userName;
+ @Transient
+ private JwtTokenVersion jwtTokenVersion;
+ @Transient
+ private List<Role> Roles;
+ // TODO ������������
+ public List<Role> getRoles(){
+ Role role = new Role();
+ role.setRoleName("temp");
+ return Arrays.asList(role);
}
-
- 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;
- }
+ @Transient
+ private Organization organization;
}
\ No newline at end of file
--
Gitblit v1.8.0