From 6c1e7d3ffc39e98782364880bb937081e91059d6 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期五, 11 四月 2025 14:52:23 +0800
Subject: [PATCH] Merge branch 'radio_frequency' of http://114.132.189.42:9002/r/lims-ruoyi-after into radio_frequency
---
basic-server/src/main/java/com/ruoyi/basic/dto/SampleTypeDto.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/dto/SampleTypeDto.java b/basic-server/src/main/java/com/ruoyi/basic/dto/SampleTypeDto.java
index 0ae8087..b2edd37 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/dto/SampleTypeDto.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/dto/SampleTypeDto.java
@@ -7,7 +7,7 @@
@Data
public class SampleTypeDto {
- private String code = "[3]";
+ private String code = "[5]";
// 妫�娴嬪璞d
private Integer sampleTypeId;
@@ -24,6 +24,10 @@
// 瀵硅薄鑻辨枃
private String sampleTypeEn;
+ private String workShopName;
+
+ private Integer workShopId;
+
private List<SampleDto> children;
}
--
Gitblit v1.9.3