From c5138faa1c4771bfbc19de5b257e7c129c081cb8 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期一, 28 八月 2023 13:30:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportVo.java | 6 +++++-
1 files changed, 5 insertions(+), 1 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 478437d..b5abe93 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
@@ -37,13 +37,17 @@
@JsonSerialize
private String conclusion;
+ @ApiModelProperty(value = "妫�楠岀被鍨�")
+ @JsonSerialize
+ private int type;
+
@ApiModelProperty(value = "瀹℃壒鐘舵�� 0锛氬緟鎻愪氦 1锛氬緟瀹℃牳锛�2锛氬凡閫氳繃 3:涓嶉�氳繃")
@JsonSerialize
private Integer status;
@ApiModelProperty(value = "瀹℃壒浜�")
@JsonSerialize
- private Integer approver;
+ private String approver;
@ApiModelProperty(value = "瀹℃牳鏃堕棿", hidden = true)
@JsonFormat(pattern = "yyyy-MM-dd ", timezone = "GMT+8")
--
Gitblit v1.9.3