From 0f5b969ddd52ca43ef003867b5a6749d74b7d71d Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 12 Nov 2025 17:52:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-route/src/main/java/com/ard/route/domain/route/ArdRouteFolder.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ard-route/src/main/java/com/ard/route/domain/route/ArdRouteFolder.java b/ard-route/src/main/java/com/ard/route/domain/route/ArdRouteFolder.java
index 79c65f9..8ec7f54 100644
--- a/ard-route/src/main/java/com/ard/route/domain/route/ArdRouteFolder.java
+++ b/ard-route/src/main/java/com/ard/route/domain/route/ArdRouteFolder.java
@@ -7,7 +7,7 @@
import lombok.Data;
/**
- * 文件夹对象 ard_route_folder
+ * 分组对象 ard_route_folder
*
* @author xia
* @date 2025-10-18
@@ -28,6 +28,6 @@
@Excel(name = "序列号")
private Integer serialNumber;
- private List<ArdRouteFile> ardRouteFileLs;
+ private List<ArdRouteInformation> ardRouteInformationLs;
}
--
Gitblit v1.9.3