From e0ef38a77c4bbe67d8a9eab46134ed00fb1e8293 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 24 八月 2023 10:53:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
user-server/src/main/java/com/yuanchu/limslaboratory/pojo/User.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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 ee1ba41..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
@@ -8,7 +8,6 @@
import java.util.Map;
import com.fasterxml.jackson.annotation.JsonFormat;
-import com.sun.jmx.snmp.Timestamp;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -54,7 +53,7 @@
private String email;
@ApiModelProperty(value = "骞撮緞")
- private Integer age;
+ private String age;
@ApiModelProperty(value = "涓�х鍚�")
private String info;
@@ -76,6 +75,9 @@
@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