Merge branch 'master' into develop

kustomization/overlays/prod/kustomization.yaml

@@ -14,4 +14,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly/admin
-  newTag: 3393fb1b0d84e11d77741ef6fbab6cecdcbe5065
+  newTag: cc1ebccedbfcd03220d7ae2615af87e5a3d9ce04

src/pages/forumManage/dynamicList/components/dynamicDetailModal/index.tsx

@@ -64,9 +64,9 @@ const DynamicDetailModal: FC<ModalProps & selfProps> = ({ open, onCancel, forumD
               <Tooltip
                 placement='bottom'
                 title={
-                  likeUserList.length ? (
+                  likeUserList?.length ? (
                     <div className='dynamic-like-user'>
-                      {likeUserList.map((v, index: number) => (
+                      {likeUserList?.map((v, index: number) => (
                         <div key={index} className='user-info'>
                           <img src={v.userImg} alt='头像' />
                           <span>{v.userName || v.nickName}</span>
@@ -83,7 +83,7 @@ const DynamicDetailModal: FC<ModalProps & selfProps> = ({ open, onCancel, forumD
             </div>
           </div>
         </div>
-        {forumDetail?.commentAndReplyVO.length ? (
+        {forumDetail?.commentAndReplyVO?.length ? (
           <div className='dynamic-detail-comment'>
             <div className='comment-title'>{forumDetail?.commentCount}条评论</div>
             {forumDetail.commentAndReplyVO.map((v, index: number) => (