From 4800caf0bc511a26624da1b9a9cf34275b6c2c4a Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期五, 01 九月 2023 17:10:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/InsProductVo.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/InsProductVo.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/InsProductVo.java
index ec69439..d928e72 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/InsProductVo.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/InsProductVo.java
@@ -58,14 +58,26 @@
private String instrumentName;
/**
+ * 璁惧id
+ **/
+ @JsonSerialize
+ private Integer instrumentId;
+
+ /**
* 鍏宠仈 鐢宠鍗昳d
**/
@JsonSerialize
private Integer inspectionMaterialId;
/**
- * 妫�楠屽憳
+ * 璐ｄ换浜�
**/
@JsonSerialize
private String userName;
+
+ /**
+ * 璐ｄ换浜篿d
+ **/
+ @JsonSerialize
+ private Integer userId;
}
--
Gitblit v1.9.3