Pengxy 3 месяцев назад
Родитель
Сommit
c8fad1df39

+ 1 - 1
yudao-module-bpm/target/generated-sources/annotations/cn/iocoder/yudao/module/bpm/convert/task/BpmProcessInstanceConvertImpl.java

@@ -8,7 +8,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2025-12-23T10:43:54+0800",
+    date = "2025-12-23T13:15:13+0800",
     comments = "version: 1.6.3, compiler: javac, environment: Java 17.0.17 (Oracle Corporation)"
 )
 public class BpmProcessInstanceConvertImpl implements BpmProcessInstanceConvert {

+ 1 - 1
yudao-module-system/target/generated-sources/annotations/cn/iocoder/yudao/module/system/convert/oauth2/OAuth2OpenConvertImpl.java

@@ -4,7 +4,7 @@ import javax.annotation.processing.Generated;
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2025-12-22T16:09:52+0800",
+    date = "2025-12-23T13:14:49+0800",
     comments = "version: 1.6.3, compiler: javac, environment: Java 17.0.17 (Oracle Corporation)"
 )
 public class OAuth2OpenConvertImpl implements OAuth2OpenConvert {

BIN
yudao-server/target/yudao-server.jar


BIN
yudao-server/target/yudao-server.jar.original


+ 13 - 5
yudao-ui/yudao-ui-admin-vue3/src/utils/format.ts

@@ -4,13 +4,21 @@
 
 /**
  * 格式化日期
- * @param date 日期字符串或Date对象
+ * @param date 日期字符串、时间戳或Date对象
  * @param format 格式化模板,默认 'YYYY-MM-DD'
  */
-export const formatDate = (date: string | Date | null | undefined, format: string = 'YYYY-MM-DD'): string => {
+export const formatDate = (date: string | number | Date | null | undefined, format: string = 'YYYY-MM-DD'): string => {
   if (!date) return '-'
   
-  const d = typeof date === 'string' ? new Date(date) : date
+  let d: Date
+  if (typeof date === 'number') {
+    d = new Date(date)
+  } else if (typeof date === 'string') {
+    d = new Date(date)
+  } else {
+    d = date
+  }
+  
   if (isNaN(d.getTime())) return '-'
   
   const year = d.getFullYear()
@@ -31,9 +39,9 @@ export const formatDate = (date: string | Date | null | undefined, format: strin
 
 /**
  * 格式化日期时间
- * @param date 日期字符串或Date对象
+ * @param date 日期字符串、时间戳或Date对象
  */
-export const formatDateTime = (date: string | Date | null | undefined): string => {
+export const formatDateTime = (date: string | number | Date | null | undefined): string => {
   return formatDate(date, 'YYYY-MM-DD HH:mm:ss')
 }