From 1516a000afd7b2116e0395f769cee8de21ab9e4e Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期五, 07 七月 2023 16:58:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
user-server/src/main/java/com/yuanchu/limslaboratory/pojo/User.java | 16 +++++++++-------
1 files changed, 9 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 9ae5655..50c73a1 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,14 @@
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;
/**
* <p>
@@ -26,6 +21,7 @@
* @since 2023-07-07
*/
@Data
+@NoArgsConstructor
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="User瀵硅薄", description="")
public class User implements Serializable {
@@ -74,5 +70,11 @@
@ApiModelProperty(value = "鍏宠仈 瑙掕壊id")
private Integer roleId;
-
+ 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