From 10de56ca16261e6a4eec49dfd32f0a6b232f7baf Mon Sep 17 00:00:00 2001
From: 晏有为 <13214124+yan-youwei@user.noreply.gitee.com>
Date: 星期四, 23 五月 2024 19:05:08 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-after
---
user-server/src/main/java/com/yuanchu/mom/pojo/User.java | 39 +++++----------------------------------
1 files changed, 5 insertions(+), 34 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..bc8bf1a 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
@@ -24,18 +24,17 @@
@TableId(type = IdType.AUTO)
private Integer id;
- @ValueTableShow(1)
+ @ValueTableShow(2)
@ApiModelProperty(value = "璐﹀彿")
private String account;
@ApiModelProperty(value = "瀵嗙爜")
private String password;
- @ValueTableShow(2)
+ @ValueTableShow(1)
@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")
@@ -96,42 +89,20 @@
/**
* 绛惧悕鐓х墖鍦板潃
*/
- @ValueTableShow(value = 12,name = "绛惧悕鐓х墖鍦板潃")
private String signatureUrl;
/**
* 鑷韩鐓х墖鍦板潃
*/
- @ValueTableShow(value = 13,name = "鑷韩鐓х墖鍦板潃")
private String pictureUrl;
/**
* 缁勭粐
*/
-// @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;
+ @ApiModelProperty(value = "LIMS鍏宠仈鐨勯儴闂╥d")
+ private String departLimsId;
+
}
--
Gitblit v1.9.3