From 30f6da8bf0143906b42fa600f6a604cea6c81f71 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期三, 26 七月 2023 09:16:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
user-server/src/main/java/com/yuanchu/limslaboratory/pojo/User.java | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 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..14cea5b 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
@@ -5,17 +5,17 @@
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;
+import java.util.Map;
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 com.sun.jmx.snmp.Timestamp;
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;
+import org.springframework.format.annotation.DateTimeFormat;
/**
* <p>
@@ -25,7 +25,9 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2023-07-07
*/
+@Accessors(chain = true)
@Data
+@NoArgsConstructor
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="User瀵硅薄", description="")
public class User implements Serializable {
@@ -54,25 +56,34 @@
@ApiModelProperty(value = "骞撮緞")
private Integer age;
- @TableLogic(value = "1", delval = "0")
- @ApiModelProperty(value = "鍦ㄨ亴鐘舵�� 姝ｅ父>=1,绂昏亴<=0")
- private Integer jobState;
-
@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;
+ this.phone = phone;
+ this.email = email;
+ this.info = info;
+ }
}
--
Gitblit v1.9.3