Merge branch 'dev' into 'master'

我的评论、banner列表增加查询条件

See merge request !5

cloud-web-manage/src/main/java/com/yizhi/application/portal/controller/SiteBannerManageController.java

@@ -72,6 +72,7 @@ public class SiteBannerManageController {
 	public Response<ReturnImageVO> listPage(
 			@ApiParam(name = "bannerName", value = "banner名称，营销，首页，培训，课程，新闻资讯，专辑") @RequestParam(name = "bannerName", required = true) String bannerName,
             @ApiParam(name = "terminalName", value = "应用名称，微信，APP，PC", required = true) @RequestParam(name = "terminalName", required = true) String terminalName,
+            @ApiParam(name = "imgTitle", value = "图片名称，空查询所有", required = false) @RequestParam(name = "imgTitle", required = false) String imgTitle,
             @ApiParam(name = "state", value = "上架 1，下架 2, 全部 3", required = true) @RequestParam(name = "state", required = true) Integer state,
             @ApiParam(name = "pageNo", value = "跳转页数,默认第一页", required = true) @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
             @ApiParam(name = "pageSize", value = "每页条数,默认20条", required = true) @RequestParam(name = "pageSize", defaultValue = "20") Integer pageSize){
@@ -97,6 +98,7 @@ public class SiteBannerManageController {
         	siteComponyIdVO.setTerminalName(terminalName);
 	        siteComponyIdVO.setPageNo(pageNo);
 	        siteComponyIdVO.setPageSize(pageSize);
+	        siteComponyIdVO.setImgTitle(imgTitle);
 	        
 			return Response.ok(bannerManageFeignClients.listPage(siteComponyIdVO));
 		}catch(Exception e){

cloud-web-manage/src/main/java/com/yizhi/application/project/controller/TpCommentController.java

@@ -39,7 +39,7 @@ public class TpCommentController {
     @ApiOperation(value = "评论列表查询", notes = "返回评论列表", response = PageCommentVo.class)
     public Response<Page<PageCommentVo>> list(
             @ApiParam(value = "培训项目id",required = true)@RequestParam("trainingProjectId")Long trainingProjectId,
-            @ApiParam(value = "关联业务类型:1活动服务;2新闻资讯；3培训测试；4培训资讯") @RequestParam("bizType") Integer bizType,
+            @ApiParam(value = "关联业务类型:1活动服务;2新闻资讯；3培训测试；4培训资讯") @RequestParam(name = "bizType", defaultValue = "1") Integer bizType,
             @ApiParam(name = "pageNo", value = "跳转页数,默认第一页", required = true) @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
             @ApiParam(name = "pageSize", value = "每页条数,默认20条", required = true) @RequestParam(name = "pageSize", defaultValue = "20") Integer pageSize){
         RequestContext requestContext = ContextHolder.get();