From 523c39cfb292a76a28e8a883e583a35a40f1b77b Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Sun, 08 Oct 2023 15:32:48 +0800
Subject: [PATCH] fix:月数据修复补充提交
---
screen-api/src/main/java/com/moral/api/entity/User.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 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 678ff19..0ae2a49 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,6 +1,7 @@
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;
@@ -13,9 +14,7 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
-
-import javax.persistence.Transient;
-
+import org.springframework.format.annotation.DateTimeFormat;
/**
* <p>
@@ -78,6 +77,9 @@
*/
private String wechat;
+
+ private Integer unitId;
+
/**
* ������������
*/
@@ -93,7 +95,8 @@
/**
* ������������
*/
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date expireTime;
/**
@@ -101,10 +104,8 @@
*/
private String isDelete;
+ @TableField(exist = false)
+ private Integer unitCode;
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
}
--
Gitblit v1.8.0