Merge remote-tracking branch 'origin/master'

web/src/main/java/com/jpsoft/enterprise/modules/mobile/controller/NewsInfoApiController.java

@@ -150,7 +150,7 @@ public class NewsInfoApiController {
             if (StringUtils.isNotBlank(code)){
                 searchParams.put("code",code);
             }
-            searchParams.put("showFlag",1);
+         //   searchParams.put("showFlag",1);
 
 
 
@@ -173,7 +173,7 @@ public class NewsInfoApiController {
                 if (StringUtils.isNotBlank(code)){
                     searchParams2.put("code",code);
                 }
-                searchParams2.put("showFlag",1);
+              //  searchParams2.put("showFlag",1);
                 List<Sort> sortList2 = new ArrayList<>();
                 sortList.add(new Sort("a.create_time","desc"));
                 page = newsInfoService.pageSearch(searchParams2,pageIndex,pageSize,true,sortList2);