From f979442f4b8fe80e58a348121711bddc4ab16268 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Tue, 25 Jan 2022 13:25:59 +0800
Subject: [PATCH] 通过服务范围查询设备及站点
---
screen-manage/src/main/java/com/moral/api/entity/ManageAccount.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/entity/ManageAccount.java b/screen-manage/src/main/java/com/moral/api/entity/ManageAccount.java
index bc18ca5..08aa2b2 100644
--- a/screen-manage/src/main/java/com/moral/api/entity/ManageAccount.java
+++ b/screen-manage/src/main/java/com/moral/api/entity/ManageAccount.java
@@ -9,6 +9,8 @@
import java.io.Serializable;
import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.moral.anno.FieldName;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -45,32 +47,39 @@
/**
* ������������
*/
+ @FieldName("������������")
private String userName;
/**
* ������
*/
+ @FieldName("������")
private String email;
/**
* ���������
*/
+ @FieldName("���������")
private String mobile;
/**
* ������
*/
- @TableField(updateStrategy = FieldStrategy.IGNORED)
+ @FieldName("������")
private String wechat;
/**
* ������������
*/
+
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",locale = "zh",timezone="GMT+8")
private Date createTime;
/**
* ������������
*/
+
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",locale = "zh",timezone="GMT+8")
private Date updateTime;
/**
@@ -78,10 +87,5 @@
*/
private String isDelete;
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
}
--
Gitblit v1.8.0