From 15e31c6e6550f9e8bf6fb1df5ca5ad4cc726b64f Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 26 八月 2023 13:30:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/ReportVo.java | 2 +-
1 files changed, 1 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..d49897a 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
@@ -43,7 +43,7 @@
@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