From 783c5e37fbe6b689f8e14d8e9691dbe81f4e799a Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期六, 26 八月 2023 16:21:57 +0800
Subject: [PATCH] 新增报告预览数据接口
---
user-server/src/main/java/com/yuanchu/limslaboratory/pojo/User.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/User.java b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/User.java
index 14cea5b..26cc155 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/User.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/User.java
@@ -8,7 +8,6 @@
import java.util.Map;
import com.fasterxml.jackson.annotation.JsonFormat;
-import com.sun.jmx.snmp.Timestamp;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -54,7 +53,7 @@
private String email;
@ApiModelProperty(value = "骞撮緞")
- private Integer age;
+ private String age;
@ApiModelProperty(value = "涓�х鍚�")
private String info;
@@ -74,11 +73,18 @@
private Integer version;
@ApiModelProperty(value = "鍏宠仈 瑙掕壊id")
- private Integer roleId;
+ private Long roleId;
@ApiModelProperty(value = "鍏宠仈 浼佷笟id")
private Integer enterpriseId;
+ @ApiModelProperty(value = "缁勭粐鏋舵瀯Id", example = "2")
+ private Integer organizationId;
+
+ @TableLogic(value = "1", delval = "0")
+ @ApiModelProperty(value = "閫昏緫鍒犻櫎 姝ｅ父>=1,鍒犻櫎<=0")
+ private Integer state;
+
public User(String account, String name, String phone, String email, String info) {
this.account = account;
this.name = name;
--
Gitblit v1.9.3