From 1e2f717393e4053a3b8de11cbf67cd98a8c77ec1 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Sat, 15 Nov 2025 15:34:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ard-route/src/main/java/com/ard/route/domain/route/ArdRouteGroup.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ard-route/src/main/java/com/ard/route/domain/route/ArdRouteGroup.java b/ard-route/src/main/java/com/ard/route/domain/route/ArdRouteGroup.java
index 1f8ef0a..7b9744e 100644
--- a/ard-route/src/main/java/com/ard/route/domain/route/ArdRouteGroup.java
+++ b/ard-route/src/main/java/com/ard/route/domain/route/ArdRouteGroup.java
@@ -7,7 +7,7 @@
 import lombok.Data;
 
 /**
- * 分组对象 ard_route_grouping
+ * 分组对象 ard_route_group
  * 
  * @author xia
  * @date 2025-10-18
@@ -22,7 +22,7 @@
 
     /** 分组名称 */
     @Excel(name = "分组名称")
-    private String groupingName;
+    private String groupName;
 
     /** 序列号 */
     @Excel(name = "序列号")

--
Gitblit v1.9.3