Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/huiju/estateagents/entity/TaHousingResources.java

@@ -167,4 +167,15 @@ public class TaHousingResources implements Serializable {
 
     @TableField(exist = false)
     private List<TaHousingResources> houseIdList;
+
+
+    /**
+     * 认筹基础热度
+     */
+    private Integer raiseHeat;
+
+    /**
+     * 认筹实际热度
+     */
+    private Integer raiseRealHeat;
 }