Merge remote-tracking branch 'yudao/dev' into dev-crm

This commit is contained in:
puhui999
2024-08-23 17:02:16 +08:00
114 changed files with 311 additions and 291 deletions

View File

@ -66,10 +66,10 @@ export const defaultShortcuts = [
export function formatDate(date: Date, format?: string): string {
// 日期不存在,则返回空
if (!date) {
return ''
return '';
}
// 日期存在,则进行格式化
return date ? dayjs(date).format(format ?? 'YYYY-MM-DD HH:mm:ss') : ''
return date ? dayjs(date).format(format ?? 'YYYY-MM-DD HH:mm:ss') : '';
}
/**