From b3b96cfd900c3dee5dc84e53d5677fc6642f85e6 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Thu, 18 Dec 2025 09:55:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ard-route/src/main/java/com/ard/route/domain/route/ArdRouteInfo.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ard-route/src/main/java/com/ard/route/domain/route/ArdRouteInfo.java b/ard-route/src/main/java/com/ard/route/domain/route/ArdRouteInfo.java
index 8339a2f..b2746ad 100644
--- a/ard-route/src/main/java/com/ard/route/domain/route/ArdRouteInfo.java
+++ b/ard-route/src/main/java/com/ard/route/domain/route/ArdRouteInfo.java
@@ -29,9 +29,9 @@
     @Excel(name = "文件路径")
     private String path;
 
-    /** 文件路径1 */
-    @Excel(name = "文件路径1")
-    private String path1;
+//    /** 文件路径1 */
+//    @Excel(name = "文件路径1")
+//    private String path1;
 
     /** 分组ID */
     @Excel(name = "分组ID")

--
Gitblit v1.9.3