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/ManageAccount.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 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 971aa9f..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
@@ -10,6 +10,7 @@
 import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.moral.anno.FieldName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -46,21 +47,25 @@
     /**
      * ������������
      */
+    @FieldName("������������")
     private String userName;
 
     /**
      * ������
      */
+    @FieldName("������")
     private String email;
 
     /**
      * ���������
      */
+    @FieldName("���������")
     private String mobile;
 
     /**
      * ������
      */
+    @FieldName("������")
     private String wechat;
 
     /**
@@ -82,10 +87,5 @@
      */
     private String isDelete;
 
-
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
 
 }

--
Gitblit v1.8.0