From 9f705a54328c4b59ad9566c521bc6e0e7577acb3 Mon Sep 17 00:00:00 2001
From: liuwh <964324856@qq.com>
Date: Fri, 13 Sep 2024 19:10:30 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh into master

---
 gz-customerSystem/src/utils/utility.js |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gz-customerSystem/src/utils/utility.js b/gz-customerSystem/src/utils/utility.js
index 2ca8375..bc2e5b1 100644
--- a/gz-customerSystem/src/utils/utility.js
+++ b/gz-customerSystem/src/utils/utility.js
@@ -180,8 +180,8 @@
 }
 
 // 时间格式化
-export function timeFormat(value, isValue, timeFormat) {
-	return !!value ? moment(value).format(timeFormat ? timeFormat : 'YYYY-MM-DD HH:mm:ss') : isValue ? '' : '-';
+export function timeFormat(value, isValue) {
+	return !!value ? moment(value).format('YYYY-MM-DD HH:mm:ss') : isValue ? '' : '-';
 }
 
 export function minuteFormat(value, isValue) {

--
Gitblit v1.8.0