From 5981f3413b9db0dea9ef7b5e33fd39d214ebb636 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 23 Jun 2021 14:19:47 +0800
Subject: [PATCH] screen-manage               增加功能: 修改型号的因子,组织型号关系表也进行维护

---
 screen-manage/src/main/java/com/moral/api/entity/ManageAccount.java |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 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..971aa9f 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,15 @@
 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 lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -61,12 +66,16 @@
     /**
      * ������������
      */
-    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;
 
     /**
      * ������������

--
Gitblit v1.8.0