Merge branch 'jrz_dev' into base-modify

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/rest/ArticleController.java

@@ -42,10 +42,13 @@ public class ArticleController extends BaseController<ArticleBiz, Article> {
      * @param id 当前文章id
      * @return
      */
-    @GetMapping("/app/unauth/three/{type}/{id}")
+    @GetMapping("/app/unauth/three")
     @ApiOperation(value = "随机获取三条数据")
-    public ObjectRestResponse randomAccessToThreeData(@PathVariable Integer type,@PathVariable Integer id){
-        return ObjectRestResponse.succ(baseBiz.getThree(type,id));
+    public ObjectRestResponse randomAccessToThreeData(@RequestParam("type") Integer type,
+                                                      @RequestParam("number") Integer number,
+                                                      @RequestParam("id") Integer id
+                                                      ){
+        return ObjectRestResponse.succ(baseBiz.getThree(type,number,id));
     }
 
     @GetMapping("/app/unauth/homePage/{type}")