合并冲突

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java

@@ -20,7 +20,6 @@ package com.epmet.dao;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.IcBuildingDTO;
-import com.epmet.dto.IcNeighborHoodDTO;
 import com.epmet.dto.ImportGeneralDTO;
 import com.epmet.dto.form.CheckHouseInfoFormDTO;
 import com.epmet.dto.form.IcBuildingListFormDTO;
@@ -247,7 +246,7 @@ public interface IcBuildingDao extends BaseDao<IcBuildingEntity> {
      * @author zhy
      * @date 2022/8/19 17:32
      */
-    List<BuildingResultDTO> listBuildingInfo(IcNeighborHoodDTO dto);
+    List<BuildingResultDTO> listBuildingInfo(String customerId,String agencyId,String  gridId,String buildingName);
 
 
     /**

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml

@@ -516,9 +516,9 @@
             </if>
     </select>
 
-    <select id="listBuildingInfo" resultType="com.epmet.dto.result.BuildingResultDTO">
         SELECT
-            CONCAT( n.NEIGHBOR_HOOD_NAME, b.BUILDING_NAME ) AS label,
+    <select id="listBuildingInfo" resultType="com.epmet.dto.result.BuildingResultDTO">
+    CONCAT( n.NEIGHBOR_HOOD_NAME, b.BUILDING_NAME ) AS label,
             b.id AS buildingId,
             b.BUILDING_NAME AS buildingName,
             n.id AS neighborhoodId,