Merge branch 'dev' into 'main'

Dev

See merge request !176

ruoyi-system/src/main/java/com/ruoyi/system/service/house/impl/HouseResourceServiceImpl.java

@@ -299,6 +299,8 @@ public class HouseResourceServiceImpl implements HouseResourceService {
                     }
                 }
             }
+        } else {
+            result = list;
         }
         if (CollectionUtils.isEmpty(result)) {
             return new PageBusinessEntityStatisticsDetail();