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

src/main/resources/mapper/TaHousingResourcesMapper.xml

             t.*,
             t2.raise_house_id,
             t3.person_id lockingPersonId,
-            t3.name lockingPersonName
+            t3.nickname lockingPersonName
         FROM
             ta_housing_resources t
             LEFT JOIN ta_raise_house t2 ON t.house_id = t2.house_id