From 70f64fd6350728df6389b8d303854d284a932526 Mon Sep 17 00:00:00 2001
From: cjl <chenjl@deyt.cn>
Date: Thu, 20 Jul 2023 19:41:38 +0800
Subject: [PATCH] chore:测试提交

---
 screen-manage/src/main/java/com/moral/api/entity/ManageAccount.java |   17 ++++++++++++-----
 1 files changed, 12 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 b259a38..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
@@ -1,12 +1,16 @@
 package com.moral.api.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 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;
 
@@ -43,31 +47,39 @@
     /**
      * ������������
      */
+    @FieldName("������������")
     private String userName;
 
     /**
      * ������
      */
+    @FieldName("������")
     private String email;
 
     /**
      * ���������
      */
+    @FieldName("���������")
     private String mobile;
 
     /**
      * ������
      */
+    @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;
 
     /**
@@ -75,10 +87,5 @@
      */
     private String isDelete;
 
-
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
 
 }

--
Gitblit v1.8.0