Merge branch 'feature' into 'release'

添加主品牌brandId

See merge request !125

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

 package com.zhiwei.brandkbs2.pojo;
 
 import com.zhiwei.brandkbs2.pojo.vo.ProjectVO;
-import com.zhiwei.middleware.event.pojo.dto.EventTagRelatedDTO;
 import lombok.Getter;
 import lombok.Setter;
 import org.springframework.data.mongodb.core.mapping.Document;
@@ -22,6 +21,11 @@ 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,6 +138,7 @@ 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());