From ba5bd31ecf829d2b462bd3f62b566828b347a89a Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期二, 08 四月 2025 13:36:18 +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 |    4 ++++
 1 files changed, 4 insertions(+), 0 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..35193a6 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
@@ -24,6 +24,10 @@
     // 瀵硅薄鑻辨枃
     private String sampleTypeEn;
 
+    private String workShopName;
+
+    private Integer workShopId;
+
     private List<SampleDto> children;
 
 }

--
Gitblit v1.9.3