From 2bfebb31df25d8ddc0c5ccaff4bed91d87e1070b Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期三, 24 七月 2024 17:45:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
user-server/src/main/java/com/yuanchu/mom/pojo/User.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 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 be0c63e..cecb68f 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,14 +24,14 @@
@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;
@@ -89,13 +89,11 @@
/**
* 绛惧悕鐓х墖鍦板潃
*/
- @ValueTableShow(value = 12,name = "绛惧悕鐓х墖鍦板潃")
private String signatureUrl;
/**
* 鑷韩鐓х墖鍦板潃
*/
- @ValueTableShow(value = 13,name = "鑷韩鐓х墖鍦板潃")
private String pictureUrl;
/**
@@ -104,4 +102,10 @@
@ApiModelProperty(value = "鍏宠仈鐨勯儴闂╥d")
private String departId;
+ @ApiModelProperty(value = "LIMS鍏宠仈鐨勯儴闂╥d")
+ private String departLimsId;
+
+ @ApiModelProperty(value = "浜轰簨绯荤粺鍏宠仈鐨刬d")
+ private String companyId;
+
}
--
Gitblit v1.9.3