From 08cad817f057c4a10e1ea59e362fbb492f3381df Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期三, 22 五月 2024 16:14:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
user-server/src/main/java/com/yuanchu/mom/pojo/User.java | 30 ------------------------------
1 files changed, 0 insertions(+), 30 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 6f4b5fb..be0c63e 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
@@ -35,7 +35,6 @@
@ApiModelProperty(value = "濮撳悕")
private String name;
- @ValueTableShow(2)
@ApiModelProperty(value = "濮撳悕EN")
private String nameEn;
@@ -43,11 +42,9 @@
@ApiModelProperty(value = "鐘舵��")
private Integer state;
- @ValueTableShow(4)
@ApiModelProperty(value = "骞撮緞")
private Integer age;
- @ValueTableShow(5)
@ApiModelProperty(value = "閭")
private String email;
@@ -58,24 +55,20 @@
@ApiModelProperty(value = "閮ㄩ棬")
private String department;
- @ValueTableShow(8)
@ApiModelProperty(value = "鍗曚綅")
private String company;
- @ValueTableShow(14)
@ApiModelProperty(value = "鍗曚綅鍦板潃")
private String address;
@ApiModelProperty(value = "瑙掕壊涓婚敭")
private Integer roleId;
- @ValueTableShow(9)
@ApiModelProperty(value = "鍒涘缓鏃ユ湡")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
- @ValueTableShow(10)
@ApiModelProperty(value = "鏇存柊鏃ユ湡")
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -108,30 +101,7 @@
/**
* 缁勭粐
*/
-// @ValueTableShow(value = 14,name = "缁勭粐")
@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