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

src/main/resources/mapper/TaHousingResourcesMapper.xml

@@ -46,7 +46,7 @@
             AND t4.`status` = 1
         <if test = "source == 'raiseChoose'">
             AND ( t6.`status` != 0 OR t6.`status` IS NULL )
-            AND (t.house_locking_status  != 'locked' OR t.house_locking_status IS NULL)
+            --AND (t.house_locking_status  != 'locked' OR t.house_locking_status IS NULL)
             AND t7.raise_start_time &lt;= now() AND t7.raise_end_time &gt;= now()
             <if test="personId != null and personId != ''">
                 AND (t6.person_id != #{personId} OR t6.person_id IS NULL)