From 60cd6696e315bc4ee8ba5e8197e08bf7774df06c Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 12 Oct 2022 14:28:12 +0800
Subject: [PATCH] 修改浑南区图表aqi计算方法
---
screen-api/src/main/java/com/moral/api/entity/User.java | 26 ++++++++++----------------
1 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/entity/User.java b/screen-api/src/main/java/com/moral/api/entity/User.java
index 4df8c9f..1ee5ef9 100644
--- a/screen-api/src/main/java/com/moral/api/entity/User.java
+++ b/screen-api/src/main/java/com/moral/api/entity/User.java
@@ -1,18 +1,19 @@
package com.moral.api.entity;
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 com.fasterxml.jackson.annotation.JsonFormat;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
import java.io.Serializable;
import java.util.Date;
-import java.util.Set;
+
import lombok.Data;
import lombok.EqualsAndHashCode;
-
-
+import org.springframework.format.annotation.DateTimeFormat;
/**
* <p>
@@ -47,6 +48,7 @@
/**
* ������
*/
+ @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
private String password;
/**
@@ -77,16 +79,20 @@
/**
* ������������
*/
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
/**
* ������������
*/
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateTime;
/**
* ������������
*/
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date expireTime;
/**
@@ -94,17 +100,5 @@
*/
private String isDelete;
-
- @TableField(exist = false)
- private Set<Group> groups;
-
- @TableField(exist = false)
- private Set<Menu> menus;
-
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
}
--
Gitblit v1.8.0