From 7bdeb3953033912f20b4639d105b640269193782 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Mon, 16 Dec 2024 12:19:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=B4=A7=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bonus/material/basic/domain/BmCompanyAddress.java   | 6 +++---
 .../mapper/material/basic/BmCompanyAddressMapper.xml        | 5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/domain/BmCompanyAddress.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/domain/BmCompanyAddress.java
index bd87fb9..c50056c 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/domain/BmCompanyAddress.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/domain/BmCompanyAddress.java
@@ -35,7 +35,7 @@ public class BmCompanyAddress extends BaseEntity {
     /** 需求所在省名称 */
     @Excel(name = "需求所在省名称")
     @ApiModelProperty(value = "需求所在省名称")
-    private Long provinceName;
+    private String provinceName;
 
     /** 需求所在市code */
     @Excel(name = "需求所在市code")
@@ -45,7 +45,7 @@ public class BmCompanyAddress extends BaseEntity {
     /** 需求所在市名称 */
     @Excel(name = "需求所在市名称")
     @ApiModelProperty(value = "需求所在市名称")
-    private Long cityName;
+    private String cityName;
 
     /** 需求所在区code */
     @Excel(name = "需求所在区code")
@@ -55,7 +55,7 @@ public class BmCompanyAddress extends BaseEntity {
     /** 需求所在区名称 */
     @Excel(name = "需求所在区名称")
     @ApiModelProperty(value = "需求所在区名称")
-    private Long areaName;
+    private String areaName;
 
     /** 企业名称 */
     @Excel(name = "企业名称")
diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/BmCompanyAddressMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/BmCompanyAddressMapper.xml
index 4a7ac26..1f8e962 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/BmCompanyAddressMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/BmCompanyAddressMapper.xml
@@ -7,8 +7,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id"    column="id"    />
         <result property="companyId"    column="company_id"    />
         <result property="provinceCode"    column="province_code"    />
+        <result property="provinceName"    column="province_name"    />
         <result property="cityCode"    column="city_code"    />
+        <result property="cityName"    column="city_name"    />
         <result property="areaCode"    column="area_code"    />
+        <result property="areaName"    column="area_name"    />
         <result property="address"    column="address"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateTime"    column="update_time"    />
@@ -16,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="selectBmCompanyAddressVo">
         select bca.id, bca.company_id, bca.province_code, bca.city_code, bca.area_code, bca.address, bca.create_time, bca.update_time,
-               b.name as areaName, b1.name as provinceName, b2.name as cityName
+               b.name as area_name, b1.name as province_name, b2.name as city_name
         from bm_company_address bca
                  LEFT JOIN base_address b ON b.code = bca.area_code
                  LEFT JOIN base_address b1 on bca.province_code = b1.code