From c427ed3db05c772cec3658949e19bcf1b6c0d2a7 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 22 八月 2023 15:03:16 +0800
Subject: [PATCH] 改动5.0
---
user-server/src/main/java/com/yuanchu/limslaboratory/pojo/User.java | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/User.java b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/User.java
index 50c73a1..4a972a5 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/User.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/User.java
@@ -3,7 +3,9 @@
import com.baomidou.mybatisplus.annotation.*;
import java.io.Serializable;
+import java.time.LocalDateTime;
import java.util.Date;
+import java.util.Map;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
@@ -11,6 +13,8 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
/**
* <p>
@@ -20,6 +24,7 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-07-07
*/
+@Accessors(chain = true)
@Data
@NoArgsConstructor
@EqualsAndHashCode(callSuper = false)
@@ -48,28 +53,31 @@
private String email;
@ApiModelProperty(value = "骞撮緞")
- private Integer age;
-
- @TableLogic(value = "1", delval = "0")
- @ApiModelProperty(value = "鍦ㄨ亴鐘舵�� 姝ｅ父>=1,绂昏亴<=0")
- private Integer jobState;
+ private String age;
@ApiModelProperty(value = "涓�х鍚�")
private String info;
+ @ApiModelProperty(value = "鍦ㄨ亴鐘舵�� 姝ｅ父>=1,绂昏亴<=0")
+ private Integer jobState;
+
@TableField(fill = FieldFill.INSERT)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone="GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
@TableField(fill = FieldFill.INSERT_UPDATE)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone="GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateTime;
+ @Version
private Integer version;
@ApiModelProperty(value = "鍏宠仈 瑙掕壊id")
private Integer roleId;
+ @ApiModelProperty(value = "鍏宠仈 浼佷笟id")
+ private Integer enterpriseId;
+
public User(String account, String name, String phone, String email, String info) {
this.account = account;
this.name = name;
--
Gitblit v1.9.3