Merge branch 'feature' into 'dev'

删除主品牌brandId

See merge request !127

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

@@ -21,11 +21,6 @@ import java.util.Map;
 public class Project extends AbstractProject {
 
     /**
-     * 主品牌id
-     */
-    private String brandId;
-
-    /**
      * 全网搜数据源(1:舆情库,2:商业数据库)
      */
     private Integer wholeSearchDataSource;

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

@@ -138,7 +138,6 @@ public class ProjectVO {
         Project project = new Project();
         project.setId(this.getId());
         project.setProjectName(this.getProjectName());
-        project.setBrandId(ObjectId.get().toString());
         project.setBrandName(this.getBrandName());
         project.setBrandLinkedGroup(this.getBrandLinkedGroup());
         project.setBrandLinkedGroupId(this.getBrandLinkedGroupId());