Merge branch 'feature' into 'release'

竞品库保留默认关键词

See merge request !352

src/main/java/com/zhiwei/brandkbs2/controller/app/AppHotController.java

@@ -142,14 +142,11 @@ public class AppHotController extends BaseController {
         if (null != keywordStr) {
             return ResponseResult.success(JSONArray.parseArray(keywordStr));
         }
-        // 主品牌则默认返回并设置品牌名
-        if (null == contendId) {
+        // 默认返回并设置品牌名
         List<String> defaultKeyword = Collections.singletonList(projectService.getProjectById(keyId).getBrandName());
         redisUtil.set(key, JSON.toJSONString(defaultKeyword));
         return ResponseResult.success(defaultKeyword);
     }
-        return ResponseResult.success();
-    }
 
     @ApiOperation("热点库-品牌热点-关键词调整")
     @PutMapping("/keyword/update")