Merge branch 'develop' into release_temp

epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml

@@ -673,7 +673,7 @@
             AND GRID_ID = #{gridId}
             </if>
             <if test="neighborId != null and neighborId != ''">
-            AND NEIGHBOR_HOOD_ID = #{neighborId}
+            AND VILLAGE_ID = #{neighborId}
             </if>
             <if test="buildingId != null and buildingId != ''">
             AND BUILD_ID = #{buildingId}