From bce822c1cb336db7dad14e7dbc12f5a8a0fd656b Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期三, 15 五月 2024 15:28:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 user-server/src/main/java/com/yuanchu/mom/pojo/User.java |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 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 ab26b1b..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
@@ -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