From 4b55cf8d21443e366f83acf20c4333abef8f54ae Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 21 八月 2023 13:40:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 user-server/src/main/java/com/yuanchu/limslaboratory/pojo/User.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 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..7c1b746 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
@@ -54,7 +54,7 @@
     private String email;
 
     @ApiModelProperty(value = "骞撮緞")
-    private Integer age;
+    private String age;
 
     @ApiModelProperty(value = "涓�х鍚�")
     private String info;
@@ -76,6 +76,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