From 15e7d7914452cb21646034e428d0bbf734d35edb Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期二, 29 八月 2023 11:47:37 +0800
Subject: [PATCH] 修改
---
user-server/src/main/java/com/yuanchu/limslaboratory/pojo/User.java | 45 +++++++++++++++++++++++++++++++--------------
1 files changed, 31 insertions(+), 14 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 9ae5655..9dcdc60 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,19 +3,15 @@
import com.baomidou.mybatisplus.annotation.*;
import java.io.Serializable;
-import java.time.LocalDateTime;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import net.sf.jsqlparser.expression.DateTimeLiteralExpression;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
/**
* <p>
@@ -25,7 +21,9 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-07-07
*/
+@Accessors(chain = true)
@Data
+@NoArgsConstructor
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="User瀵硅薄", description="")
public class User implements Serializable {
@@ -52,27 +50,46 @@
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 = "绫诲瀷")
+ private Integer type;
+
+ @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;
+ private Long roleId;
+ @ApiModelProperty(value = "鍏宠仈 浼佷笟id")
+ private Integer enterpriseId;
+ @ApiModelProperty(value = "缁勭粐鏋舵瀯Id", example = "2")
+ private Integer organizationId;
+
+ @TableLogic(value = "1", delval = "0")
+ @ApiModelProperty(value = "閫昏緫鍒犻櫎 姝ｅ父>=1,鍒犻櫎<=0")
+ private Integer state;
+
+ public User(String account, String name, String phone, String email, String info) {
+ this.account = account;
+ this.name = name;
+ this.phone = phone;
+ this.email = email;
+ this.info = info;
+ }
}
--
Gitblit v1.9.3