Shun Miyazawa 3 lat temu
rodzic
commit
02ad034f8c

+ 1 - 1
packages/app/src/components/PageEditor/ConflictDiffModal.tsx

@@ -314,7 +314,7 @@ export const ConflictDiffModal = (props: ConflictDiffModalProps): JSX.Element =>
   const origin: IRevisionOnConflictWithStringDate = {
   const origin: IRevisionOnConflictWithStringDate = {
     revisionId: currentPage?.revision._id,
     revisionId: currentPage?.revision._id,
     revisionBody: currentPage?.revision.body,
     revisionBody: currentPage?.revision.body,
-    createdAt: format(currentPage.updatedAt, 'yyyy/MM/dd HH:mm:ss'),
+    createdAt: format(new Date(currentPage.updatedAt), 'yyyy/MM/dd HH:mm:ss'),
     user: currentPage?.lastUpdateUser,
     user: currentPage?.lastUpdateUser,
   };
   };
   const latest: IRevisionOnConflictWithStringDate = {
   const latest: IRevisionOnConflictWithStringDate = {