Merge branch 'dev' of http://47.100.44.39:10001/tp-backend/tanpu-community into dev

community-api/src/main/java/com/tanpu/community/api/beans/qo/TopicRankQo.java

@@ -23,11 +23,18 @@ public class TopicRankQo {
     @ApiModelProperty(value = "讨论量")
     private Integer disscussCount;
 
+    @ApiModelProperty(value = "是否置顶")
+    private Integer isTop;
+
     /**
      * TODO 热度计算算法
      * @return
      */
     public Integer getRank(){
+        //顶置话题
+        if (isTop>0){
+            return Integer.MAX_VALUE;
+        }
         return this.viewCount+this.disscussCount*3;
     }
 }