From dd571bf55de7f9a72d458adc179958ed2f9473c0 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 21 八月 2023 09:39:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportVo.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportVo.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportVo.java
index 0bb084b..9c7849e 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportVo.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportVo.java
@@ -21,7 +21,7 @@
@ApiModelProperty(value = "瀹℃壒浜�")
@JsonSerialize
private Integer approver;
- @ApiModelProperty(value = "瀹℃壒鐘舵�� 0锛氬緟鎻愪氦 1锛氬緟瀹℃牳锛�2锛氬緟绛惧瓧锛�3锛氬凡瀹屾垚")
+ @ApiModelProperty(value = "瀹℃壒鐘舵�� 0锛氬緟鎻愪氦 1锛氬緟瀹℃牳锛�2锛氬凡瀹℃牳")
@JsonSerialize
private Integer status;
@ApiModelProperty(value = "妫�楠岀粨璁�")
@@ -29,5 +29,5 @@
private String conclusion;
@ApiModelProperty(value = "缂栧埗浜�")
@JsonSerialize
- private Integer userId;
+ private String name;
}
--
Gitblit v1.9.3