From fcc47e46f68a2943557a21b1400b2f0db56d48e9 Mon Sep 17 00:00:00 2001
From: lml <1297555865@qq.com>
Date: Thu, 22 Oct 2026 09:48:05 +0800
Subject: [PATCH] =?UTF-8?q?fix(botp):=20ConvertRule=20=E8=A1=A5=E5=88=86?=
 =?UTF-8?q?=E5=8D=95=E5=AD=97=E6=AE=B5=E5=90=8D=E7=A7=B0=E5=B9=B6=E5=AE=9E?=
 =?UTF-8?q?=E7=8E=B0=20Serializable?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 分单策略的配套字段只有 groupByField，缺少用于展示的 groupByFieldName，
  前端选中分组字段后无法回显名称，补上该字段（仅展示用途，不参与分单计算，
  执行侧仍按 field id 取分组依据）
- 实体实现 Serializable，与 ReverseWritingRules 等规则实体保持一致
---
 .../src/main/java/apelet/common/botp/model/ConvertRule.java        | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/common/common-botp/src/main/java/apelet/common/botp/model/ConvertRule.java b/common/common-botp/src/main/java/apelet/common/botp/model/ConvertRule.java
index 3a98a3a..f9538d0 100644
--- a/common/common-botp/src/main/java/apelet/common/botp/model/ConvertRule.java
+++ b/common/common-botp/src/main/java/apelet/common/botp/model/ConvertRule.java
@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
 
@@ -22,7 +23,7 @@ import java.util.Map;
 @Data
 @Schema( description = "转换规则存值主表")
 @TableName("convert_rule")
-public class ConvertRule extends BaseModel {
+public class ConvertRule extends BaseModel implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -167,6 +168,10 @@ public class ConvertRule extends BaseModel {
     @Schema(description = "分单字段")
     private String groupByField;
 
+    @Excel(name = "分单字段名称", width = 15)
+    @Schema(description = "分单字段名称")
+    private String groupByFieldName;
+
     @Excel(name = "规则启用条件", width = 15)
     @Schema(description = "规则启用条件，,留空 = 始终启用")
     private String enableConditionJson;