Merge branch 'feature-content4-3' into test_branch

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/role/HaobanRoleApiServiceImpl.java

@@ -612,7 +612,7 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService {
         menuCodeMap.put("2" + ContentMaterialROleInitQDTO.Version.LOW.getCode(), Arrays.asList("materialMain", "commodityCenter", "commodityCenterTab", "materialCenterTab", "goodsDetail_material", "goodsCenter_Count", "materialManage"));
         menuCodeMap.put("2" + ContentMaterialROleInitQDTO.Version.HIGH.getCode(), Arrays.asList("materialMain", "commodityCenter", "commodityCenterTab", "materialCenterTab",
                 "goodsDetail_material", "goodsCenter_Count", "materialManage", "publishMaterial", "userCenter_createCenter"));
-        // superManagementMenuCode.add("");
+        superManagementMenuCode.add("knowledgeBase");
     }
 
 

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/content/CommentController.java

@@ -141,6 +141,7 @@ public class CommentController {
         }
         Map<String, StaffClerkRelationDTO> clerkInfoMap = this.getClerkInfoMap(saveCommentQO.getWxEnterpriseId(), clerkIds);
         StaffClerkRelationDTO staffClerkRelationDTO = clerkInfoMap.get(saveCommentQO.getClerkId());
+        saveCommentQDTO.setUserType(UserTypeEnum.CLERK.value);
         if (staffClerkRelationDTO != null) {
             saveCommentQDTO.setUserCode(staffClerkRelationDTO.getClerkCode());
             if (HaobanClerkTypeEnum.AREA_MANAGER.getCode().equals(staffClerkRelationDTO.getClerkType())) {

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/content/ContentMaterialInfoVO.java

@@ -2,6 +2,7 @@ package com.gic.haoban.manage.web.vo.content;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.gic.content.api.dto.ext.ContentMaterialExt;
 import org.apache.commons.lang3.StringUtils;
 
 import java.io.Serializable;
@@ -156,6 +157,11 @@ public class ContentMaterialInfoVO implements Serializable {
      */
     private Integer likeFlag;
 
+    /**
+     * 素材额外信息
+     */
+    private ContentMaterialExt ext;
+
 
     public Long getContentMaterialId() {
         return contentMaterialId;
@@ -381,6 +387,14 @@ public class ContentMaterialInfoVO implements Serializable {
         this.likeFlag = likeFlag;
     }
 
+    public ContentMaterialExt getExt() {
+        return ext;
+    }
+
+    public void setExt(ContentMaterialExt ext) {
+        this.ext = ext;
+    }
+
     public void convertMaterialImages(String materialImageUrls, String materialThumbnailImageUrls) {
         if (StringUtils.isNotBlank(materialImageUrls)) {
             String[] split = StringUtils.split(materialImageUrls, ",");