Merge branch 'feature' into 'master'

Project.isMergeSensitive 主品牌默认为true

See merge request !212

src/main/java/com/zhiwei/brandkbs2/pojo/Project.java

@@ -115,7 +115,7 @@ public class Project extends AbstractProject {
         projectVO.setNegativeChannelParams(this.getNegativeChannelParams());
         projectVO.setPositiveChannelParams(this.getPositiveChannelParams());
         projectVO.setBlackChannelGroup(this.getBlackChannelGroup());
-
+        projectVO.setMergeSensitive(true);
         return projectVO;
     }
 

src/main/java/com/zhiwei/brandkbs2/pojo/vo/ProjectVO.java

@@ -73,8 +73,7 @@ public class ProjectVO {
      * 是否包含敏感
      */
     @ApiModelProperty("是否包含敏感")
-    private boolean isMergeSensitive;
-    ;
+    private boolean isMergeSensitive = true;
     /**
      * 命中标签
      */