From 1817e58dc2b666ea1ad736920c680e3b8ac76e58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E5=AE=87=E5=A5=87?= <liangyuqi@bdfint.com>
Date: Thu, 3 Jul 2025 19:52:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/xkt/vo/express/ExpressFeeConfigVO.java    | 3 +++
 .../src/main/resources/mapper/system/SysRoleMapper.xml       | 2 +-
 .../java/com/ruoyi/xkt/dto/express/ExpressFeeConfigDTO.java  | 4 ++++
 .../java/com/ruoyi/xkt/service/impl/ExpressServiceImpl.java  | 5 ++++-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/express/ExpressFeeConfigVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/express/ExpressFeeConfigVO.java
index 57f9693d7..e82ac2705 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/express/ExpressFeeConfigVO.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/express/ExpressFeeConfigVO.java
@@ -31,6 +31,9 @@ public class ExpressFeeConfigVO {
      */
     @ApiModelProperty(value = "地区编码")
     private String regionCode;
+
+    @ApiModelProperty(value = "地区名称")
+    private String regionName;
     /**
      * 上级地区编码，没有上级的默认空
      */
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
index c128b0302..2bb1d1f15 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
@@ -12,7 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="roleKey"     column="role_key"    />
 		<result property="roleSort"     column="role_sort"    />
 		<result property="storeId"     column="store_id"    />
-		<result property="status"     column="role_status"    />
+		<result property="status"     column="status"    />
 		<result property="createBy"     column="create_by"    />
 		<result property="createTime"     column="create_time"    />
 		<result property="updateBy"     column="update_by"    />
diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/express/ExpressFeeConfigDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/express/ExpressFeeConfigDTO.java
index 05d61dcbb..6f9c05562 100644
--- a/xkt/src/main/java/com/ruoyi/xkt/dto/express/ExpressFeeConfigDTO.java
+++ b/xkt/src/main/java/com/ruoyi/xkt/dto/express/ExpressFeeConfigDTO.java
@@ -25,6 +25,10 @@ public class ExpressFeeConfigDTO {
      * 地区编码，基于行政区划代码做扩展，唯一约束
      */
     private String regionCode;
+    /**
+     * 地区名称
+     */
+    private String regionName;
     /**
      * 上级地区编码，没有上级的默认空
      */
diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/ExpressServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/ExpressServiceImpl.java
index 7b1d0fd79..f2653d1db 100644
--- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/ExpressServiceImpl.java
+++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/ExpressServiceImpl.java
@@ -325,7 +325,10 @@ public class ExpressServiceImpl implements IExpressService {
     @Override
     public ExpressFeeConfigDTO getExpressFeeConfigById(Long id) {
         ExpressFeeConfig config = expressFeeConfigMapper.selectById(id);
-        return BeanUtil.toBean(config, ExpressFeeConfigDTO.class);
+        ExpressFeeConfigDTO dto = BeanUtil.toBean(config, ExpressFeeConfigDTO.class);
+        String regionName = getAllExpressNameMap().get(config.getRegionCode());
+        dto.setRegionName(regionName);
+        return dto;
     }
 
     @Transactional(rollbackFor = Exception.class)