调整

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;
     /**
      * 上级地区编码，没有上级的默认空
      */

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"    />

xkt/src/main/java/com/ruoyi/xkt/dto/express/ExpressFeeConfigDTO.java

@@ -25,6 +25,10 @@ public class ExpressFeeConfigDTO {
      * 地区编码，基于行政区划代码做扩展，唯一约束
      */
     private String regionCode;
+    /**
+     * 地区名称
+     */
+    private String regionName;
     /**
      * 上级地区编码，没有上级的默认空
      */

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)