Merge branch 'release' into 'master'

Release

See merge request !418

src/main/java/com/zhiwei/brandkbs2/controller/admin/ArticleController.java

@@ -43,6 +43,7 @@ import java.util.Map;
 @RequestMapping("/admin/article")
 @Api(tags = "稿件上传", description = "提供稿件的上传功能")
 @Auth(role = RoleEnum.COMMON_ADMIN)
+@Deprecated
 public class ArticleController extends BaseController {
     public static final Logger log = LogManager.getLogger(ArticleController.class);
 

src/main/java/com/zhiwei/brandkbs2/service/impl/IndexServiceImpl.java

@@ -310,7 +310,7 @@ public class IndexServiceImpl implements IndexService {
         JSONObject yuQing = new JSONObject();
         yuQing.put("avgTotal", yuQingResult.getIntValue("avgTotal"));
         yuQing.put("compare", yuQingResult.getDoubleValue("compare"));
-        yuQing.put("yuqingTotal", yuQingResult.getIntValue("yuqingTotal"));
+        yuQing.put("yuqingTotal", yuQingResult.getIntValue("rangeCount"));
         result.put("yuqing", yuQing);
         JSONObject reputation = new JSONObject();
         reputation.put("avgReputation", reputationResult.getDoubleValue("avgPosPro"));