From 3f0e25410f5aa3f01fda3d2d6410d89dc74159f3 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 19 八月 2023 15:16:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/PlanVo.java | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/PlanVo.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/PlanVo.java
index b876d6a..a2a6253 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/PlanVo.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/PlanVo.java
@@ -48,12 +48,6 @@
@ApiModelProperty(value = "璁″垝缁撴潫鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date finishtime;
- @ApiModelProperty(value = "璁惧id")
- @JsonSerialize
- private Integer deviceId;
- @ApiModelProperty(value = "妫�楠屼汉id")
- @JsonSerialize
- private Integer userId;
//鍒ゆ柇椤圭洰鐘舵��
private Integer state;
--
Gitblit v1.9.3