From b939331cf60d3bb36ee8aa208cf05c3a5a04415f Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 06 八月 2024 12:46:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/dto/InsOrderPlanDTO.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/InsOrderPlanDTO.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/InsOrderPlanDTO.java
index 9db96c1..60c7548 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/dto/InsOrderPlanDTO.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/dto/InsOrderPlanDTO.java
@@ -1,14 +1,15 @@
package com.yuanchu.mom.dto;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.yuanchu.mom.annotation.ValueTableShow;
import com.yuanchu.mom.common.OrderBy;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-@Data
-public class InsOrderPlanDTO extends OrderBy {
+import java.io.Serializable;
- @ApiModelProperty("鏄惁鍙湅鑷繁鐨勪换鍔�")
- private Boolean viewSelf;
+@Data
+public class InsOrderPlanDTO extends OrderBy implements Serializable {
@ApiModelProperty("妫�楠屼换鍔′富閿甶d")
private Long insSampleId;
@@ -20,12 +21,12 @@
private Integer state;
@ApiModelProperty("瀛愬疄楠屽")
- private String childrenLaboratory;
-
- @ApiModelProperty("鏍峰搧鍚嶇О")
- private String sampleName;
+ private String sonLaboratory;
@ApiModelProperty("妫�楠岀姸鎬�")
private String insState;
+ @ApiModelProperty("濮旀墭缂栧彿")
+ private String entrustCode;
+
}
--
Gitblit v1.9.3