From 08004029f1fb93d5a433c55a53109b2d11caf96a Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期三, 02 四月 2025 09:32:14 +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/StructureTestObjectDto.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/dto/StructureTestObjectDto.java b/basic-server/src/main/java/com/ruoyi/basic/dto/StructureTestObjectDto.java
index 3d278ba..9734ab9 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/dto/StructureTestObjectDto.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/dto/StructureTestObjectDto.java
@@ -1,15 +1,20 @@
package com.ruoyi.basic.dto;
+import com.ruoyi.basic.pojo.StructureTestObject;
import lombok.Data;
-@Data
-public class StructureTestObjectDto {
+import java.util.List;
- private Integer id;
+@Data
+public class StructureTestObjectDto extends StructureTestObject {
private String name;
private Integer workShopId;
private String workShopName;
+
+ private String objectType;
+
+ private List<BasicTreeDto> children;
}
--
Gitblit v1.9.3