From 65b70cf13a2ec91013d876771be878c165cae3a4 Mon Sep 17 00:00:00 2001 From: cjl <909710561@qq.com> Date: Tue, 23 Apr 2024 15:32:45 +0800 Subject: [PATCH] fix:补充提交 --- screen-api/src/main/java/com/moral/api/entity/User.java | 20 ++++++++++++-------- 1 files changed, 12 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..beba49b 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; /** @@ -102,9 +105,10 @@ private String isDelete; - @Override - protected Serializable pkVal() { - return this.id; - } + private String openId; + + @TableField(exist = false) + private Integer unitCode; + } -- Gitblit v1.8.0