From 58a75277a83e48baa8ff9906e27975960659ff8a Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期四, 16 五月 2024 14:53:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
user-server/src/main/java/com/yuanchu/mom/pojo/User.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/user-server/src/main/java/com/yuanchu/mom/pojo/User.java b/user-server/src/main/java/com/yuanchu/mom/pojo/User.java
index 1a6fef4..6f4b5fb 100644
--- a/user-server/src/main/java/com/yuanchu/mom/pojo/User.java
+++ b/user-server/src/main/java/com/yuanchu/mom/pojo/User.java
@@ -62,7 +62,7 @@
@ApiModelProperty(value = "鍗曚綅")
private String company;
- @ValueTableShow(8)
+ @ValueTableShow(14)
@ApiModelProperty(value = "鍗曚綅鍦板潃")
private String address;
@@ -112,4 +112,26 @@
@ApiModelProperty(value = "鍏宠仈鐨勯儴闂╥d")
private String departId;
+ ////浜哄憳缂栧彿锛屽叏灞�鍞竴
+// private String employeeID;
+////宀椾綅
+// private String position;
+////宀椾綅缂栫爜
+// private String positionCode;
+////鎵嬫満鍙风爜
+// private String phoneNumber;
+//
+// //鎬у埆 1:鐢� 2:濂�
+// private int gender;
+//
+// //缁勭粐鐘舵�� enable:鍦ㄨ亴 disabled:绂昏亴
+// private String status;
+////鎵�灞炵粍缁囩紪鐮�
+// private String companyId;
+////鍏徃閭(鍙敤浜庨偖绠辩郴缁�)
+// private String companyEmail;
+////鍏ヨ亴鍏徃鏃堕棿
+// private String dateOfJoiningTheCompany;
+////缁勭粐鍐呯殑閮ㄩ棬缂栫爜
+// private String departmentCode;
}
--
Gitblit v1.9.3