Merge branch 'dev'

ruoyi-system/src/main/java/com/ruoyi/system/domain/house/vo/HouseResourceDetail.java

@@ -99,4 +99,6 @@ public class HouseResourceDetail {
     private String remark;
 
     private List<BusinessEntityDto> businessEntityDtoList;
+
+    private Boolean gs;
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/house/vo/HouseResourcePage.java

@@ -103,4 +103,6 @@ public class HouseResourcePage {
     private String nature;
 
     private String industryClassification;
+
+    private Boolean gs;
 }