Merge branch 'release' into 'master'

Release

See merge request !353

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

@@ -142,13 +142,10 @@ 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();
+        // 默认返回并设置品牌名
+        List<String> defaultKeyword = Collections.singletonList(projectService.getProjectById(keyId).getBrandName());
+        redisUtil.set(key, JSON.toJSONString(defaultKeyword));
+        return ResponseResult.success(defaultKeyword);
     }
 
     @ApiOperation("热点库-品牌热点-关键词调整")