Merge branch 'dev' into 'master'

问卷接口参数调整

See merge request !9

cloud-research-api/src/main/java/com/yizhi/research/application/feign/ResearchClient.java

@@ -216,7 +216,7 @@ public interface ResearchClient {
      * @return
      * @return
      */
      */
     @GetMapping("/research/top/get")
     @GetMapping("/research/top/get")
-    List<ResearchVo> getResearchTop(@RequestParam("bizType") Integer bizType);
+    List<ResearchVo> getResearchTop(@RequestParam(value = "bizType", required = false) Integer bizType);
     
     
     /**
     /**
      * 查看研信详情
      * 查看研信详情

cloud-research-service/src/main/java/com/yizhi/research/application/controller/ResearchController.java

@@ -405,7 +405,7 @@ public class ResearchController {
      * @return
      * @return
      */
      */
     @GetMapping("/top/get")
     @GetMapping("/top/get")
-    List<ResearchVo> getResearchTop(@RequestParam("bizType") Integer bizType){
+    List<ResearchVo> getResearchTop(@RequestParam(value = "bizType", required = false) Integer bizType){
     	return researchService.getResearchTop(bizType);
     	return researchService.getResearchTop(bizType);
     }
     }