From 6344a8b6b7e2853dbfa9e6506ff2e17a31930297 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Mon, 10 Jul 2023 14:17:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into dev
---
screen-manage/src/main/java/com/moral/api/entity/ManageAccount.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 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 bac1a30..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,10 +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;
@@ -41,42 +47,45 @@
/**
* ������������
*/
+ @FieldName("������������")
private String userName;
/**
* ������
*/
+ @FieldName("������")
private String email;
/**
* ���������
*/
+ @FieldName("���������")
private String mobile;
/**
* ������
*/
+ @FieldName("������")
private String wechat;
/**
* ������������
*/
- private LocalDateTime createTime;
+
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",locale = "zh",timezone="GMT+8")
+ private Date createTime;
/**
* ������������
*/
- private LocalDateTime updateTime;
+
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",locale = "zh",timezone="GMT+8")
+ private Date updateTime;
/**
* ������������
*/
private String isDelete;
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
}
--
Gitblit v1.8.0