Merge branch 'dev' into 'master'

问卷获取置顶

See merge request !8

cloud-web-student/src/main/java/com/yizhi/application/protal/controller/BannerApiController.java

@@ -96,7 +96,7 @@ public class BannerApiController {
 					}
 				}
 			} else if(vo != null && BannerNameEnum.RESEARCH.getKey().equals(vo.getBannerName())){
-				List<ResearchVo> list = researchClient.getResearchTop(1);
+				List<ResearchVo> list = researchClient.getResearchTop(null);//获取所有类型的置顶
 				if (!CollectionUtils.isEmpty(list)) {
 					result = new ArrayList<ImageListVO>(1);
 					for(ResearchVo item : list){