Merge branch 'feature' into 'dev'

移动端关键字搜索渠道列表调整

See merge request !258

src/main/java/com/zhiwei/brandkbs2/controller/mobile/MobileSearchController.java

@@ -55,14 +55,14 @@ public class MobileSearchController {
             @ApiImplicitParam(name = "size", value = "每页记录数", required = false, defaultValue = "10", paramType = "query", dataType = "int"),
             @ApiImplicitParam(name = "keyword", value = "关键字", required = false, defaultValue = "", paramType = "query", dataType = "String"),
             @ApiImplicitParam(name = "platform", value = "平台筛选", required = false, defaultValue = "全部", paramType = "query", dataType = "String"),
-            @ApiImplicitParam(name = "emotion", value = "情感倾向", required = false, defaultValue = "0", paramType = "query", dataType = "int")
+            @ApiImplicitParam(name = "emotion", value = "情感倾向", required = false, defaultValue = "-1", paramType = "query", dataType = "int")
     })
     @GetMapping("/channel")
     public ResponseResult searchChannelList(@RequestParam(value = "page", defaultValue = "1") int page,
                                             @RequestParam(value = "size", defaultValue = "10") int size,
                                             @RequestParam(value = "keyword", defaultValue = "") String keyword,
                                             @RequestParam(value = "platform", defaultValue = "全部") String platform,
-                                            @RequestParam(value = "emotion", defaultValue = "0") int emotion) {
+                                            @RequestParam(value = "emotion", defaultValue = "-1") int emotion) {
         JSONObject sorter = new JSONObject();
         sorter.put("last_time","descend");
         return ResponseResult.success(channelService.getChannelListNew(page, size, keyword, Collections.singletonList(platform),