From 04c90bec00f91e8c403d7acaa338f69e5029617a Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Tue, 02 Dec 2025 10:41:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-route/src/main/java/com/ard/route/domain/route/ArdRouteGroup.java | 6 ++++--
1 files changed, 4 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..9b6ee6e 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
@@ -5,13 +5,15 @@
import com.ard.common.annotation.Excel;
import com.ard.common.core.domain.BaseEntity;
import lombok.Data;
+import lombok.EqualsAndHashCode;
/**
- * 分组对象 ard_route_grouping
+ * 分组对象 ard_route_group
*
* @author xia
* @date 2025-10-18
*/
+@EqualsAndHashCode(callSuper = true)
@Data
public class ArdRouteGroup extends BaseEntity {
@@ -22,7 +24,7 @@
/** 分组名称 */
@Excel(name = "分组名称")
- private String groupingName;
+ private String groupName;
/** 序列号 */
@Excel(name = "序列号")
--
Gitblit v1.9.3