Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

src/main/resources/mapper/TaHousingResourcesMapper.xml

@@ -90,6 +90,8 @@
             AND t.apartment_id = #{apartmentId}
         </if>
         ) t5
+        GROUP BY
+        t5.house_id
         ORDER BY
         t5.termNamePre,
         t5.blockNamePre,