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"
-
+
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)