From 19f6e548ef85afde388b8bb2c80fed91e2b9601c Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 1 Jun 2022 10:20:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E5=88=97=E8=A1=A8=EF=BC=9Are?=
 =?UTF-8?q?mark?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dto/result/IcHouseListResultDTO.java   | 2 +-
 .../gov-org-server/src/main/resources/mapper/IcHouseDao.xml    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java
index 4c1b40288f..1bcb7e45e9 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java
@@ -80,6 +80,6 @@ public class IcHouseListResultDTO implements Serializable {
     private String ownerIdCard;
 
     private Double sort;
-
+    private String remark;
 
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
index a8222a88bb..a1a37d1bc0 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
@@ -112,7 +112,8 @@
         ag.ORGANIZATION_NAME agencyName,
         c.GRID_ID as gridId,
         gr.GRID_NAME,
-        IFNULL(a.sort,0) as sort
+        IFNULL(a.sort,0) as sort,
+        a.REMARK as remark
         from ic_house a
         LEFT JOIN ic_building b on a.BUILDING_ID = b.ID and b.DEL_FLAG = '0'
         LEFT JOIN ic_neighbor_hood c on a.NEIGHBOR_HOOD_ID = c.ID and c.DEL_FLAG = '0'