From 70a98b2b11b25c7a3b32c07cdc5043b60383220d Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 23 Sep 2021 16:59:12 +0800
Subject: [PATCH] 根据组织查设备，站点加入子组织
---
screen-manage/src/main/java/com/moral/api/entity/User.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/entity/User.java b/screen-manage/src/main/java/com/moral/api/entity/User.java
index 15bf9e3..3270af6 100644
--- a/screen-manage/src/main/java/com/moral/api/entity/User.java
+++ b/screen-manage/src/main/java/com/moral/api/entity/User.java
@@ -9,6 +9,7 @@
import java.io.Serializable;
import java.util.Date;
+import com.moral.anno.FieldName;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -51,6 +52,7 @@
/**
* ������������
*/
+ @FieldName("������������")
private String userName;
/**
@@ -61,16 +63,19 @@
/**
* ������
*/
+ @FieldName("������")
private String email;
/**
* ���������
*/
+ @FieldName("������")
private String mobile;
/**
* ������
*/
+ @FieldName("������")
private String wechat;
/**
@@ -96,10 +101,5 @@
*/
private String isDelete;
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
}
--
Gitblit v1.8.0