From f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 13 三月 2025 10:46:24 +0800
Subject: [PATCH] 分支合并冲突解决
---
basic-server/src/main/java/com/ruoyi/basic/dto/SampleTypeDto.java | 11 -----------
1 files changed, 0 insertions(+), 11 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..050675a 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
@@ -9,20 +9,9 @@
private String code = "[3]";
- // 妫�娴嬪璞d
- private Integer sampleTypeId;
-
- // 妫�娴嬪璞℃帓搴�
- private Integer sort;
-
private String label;
private String value;
-
- private String partNo;
-
- // 瀵硅薄鑻辨枃
- private String sampleTypeEn;
private List<SampleDto> children;
--
Gitblit v1.9.3