Merge branch 'feature-content4-3' into developer

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

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

@@ -637,6 +637,7 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService {
             enterpriseId = params;
         }
         List<String> menuCodes = new ArrayList<>();
+        menuCodes.add("knowledgeBase");
         menuCodes.add("AICreate");
 
         for (String tempId : enterpriseIds) {

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

@@ -75,7 +75,7 @@ public class CommentController {
      */
     @RequestMapping(path = "/list-comment")
     public RestResponse<Page<CommentInfoVO>> listCommentInfoVo(CommentCountQO commentCountQO) {
-        ListMobileCommentQDTO mobileCommentQDTO = new ListMobileCommentQDTO();
+        ListMobileCommentQDTO mobileCommentQDTO = EntityUtil.changeEntityByJSON(ListMobileCommentQDTO.class, commentCountQO);
         mobileCommentQDTO.setEnterpriseId(commentCountQO.getEnterpriseId());
         mobileCommentQDTO.setContentMaterialId(commentCountQO.getContentMaterialId());
         mobileCommentQDTO.setMemberId(commentCountQO.getClerkId());