From e642145107c7e32bb9bcc0e4e9707040e9207a9c Mon Sep 17 00:00:00 2001
From: yangmaofu <yangmaofu@inspur.com>
Date: Fri, 3 Apr 2026 16:18:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=9E=E4=BD=93=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../springblade/lims/goods/entity/ContractDetail.java |  4 ++++
 .../java/org/springblade/lims/goods/entity/Goods.java |  4 ++++
 .../main/java/org/springblade/lims/entry/Examine.java | 11 +++++++++++
 .../java/org/springblade/lims/entry/ExamineWay.java   |  5 +++++
 4 files changed, 24 insertions(+)

diff --git a/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/ContractDetail.java b/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/ContractDetail.java
index 6e7e32d..7c2f6bc 100644
--- a/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/ContractDetail.java
+++ b/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/ContractDetail.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.NullSerializer;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.mp.base.BaseEntity;
@@ -42,6 +43,9 @@ public class ContractDetail extends BaseEntity implements Serializable {
     // 本次到货数量
     @TableField(exist = false)
     private Integer num;
+    @TableField(exist = false)
+    private String brand;
+
 
 
 }
diff --git a/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/Goods.java b/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/Goods.java
index d85ee52..fde3864 100644
--- a/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/Goods.java
+++ b/lab-service-api/lab-capital-api/src/main/java/org/springblade/lims/goods/entity/Goods.java
@@ -120,6 +120,10 @@ public class Goods extends BaseEntity {
 	@TableField(exist = false)
 	private Integer outNum;
 
+	// 库存数量
+	@TableField(exist = false)
+	private Integer goodsNum;
+
 	// 未到货数量
 	@TableField(exist = false)
 	@JsonSerialize(nullsUsing = NullSerializer.class)
diff --git a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Examine.java b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Examine.java
index 7cd04c5..768c3dd 100644
--- a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Examine.java
+++ b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/Examine.java
@@ -232,4 +232,15 @@ public class Examine extends BaseEntity implements Serializable {
 
     // 是否复检
     private Integer isRecheck;
+
+    // 开始时间
+    @TableField(exist = false)
+    private String startTime;
+
+    // 结束
+    @TableField(exist = false)
+    private String endTime;
+
+    @TableField(exist = false)
+    private String testResults;
 }
\ No newline at end of file
diff --git a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/ExamineWay.java b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/ExamineWay.java
index d3bbea6..e7016a9 100644
--- a/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/ExamineWay.java
+++ b/lab-service-api/lab-lims-api/src/main/java/org/springblade/lims/entry/ExamineWay.java
@@ -69,4 +69,9 @@ public class ExamineWay extends BaseEntity implements Serializable {
      */
     private String inputMode;
 
+    /**
+     * 动物种类
+     */
+    private String animalSpecies;
+
 }
\ No newline at end of file