From eb975b40828b3a930fb38b75c739a7385b14ee12 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期四, 03 四月 2025 14:48:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/radio_frequency' 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