From 534533425b15b183cea60fa162d9884e5d3c6243 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 13 十月 2026 17:55:50 +0800
Subject: [PATCH] Merge branch 'dev_海西州_北京同仁堂' into dev_海西州_惠牧

---
 src/views/wms/order/shipment/data.ts |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/wms/order/shipment/data.ts b/src/views/wms/order/shipment/data.ts
index 7d41840..f4f2278 100644
--- a/src/views/wms/order/shipment/data.ts
+++ b/src/views/wms/order/shipment/data.ts
@@ -7,7 +7,7 @@
 
 import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
-import { formatDate, formatDateTime } from '@vben/utils';
+import { formatDate } from '@vben/utils';
 
 import { z } from '#/adapter/form';
 import { getSimpleUserList } from '#/api/system/user';
@@ -290,7 +290,7 @@
     {
       field: 'createTime',
       label: '鍒涘缓鏃堕棿',
-      render: (val) => formatDateTime(val) || '-',
+      render: (val) => formatDate(val) || '-',
     },
     {
       field: 'creatorName',
@@ -300,7 +300,7 @@
     {
       field: 'updateTime',
       label: '鏇存柊鏃堕棿',
-      render: (val) => formatDateTime(val) || '-',
+      render: (val) => formatDate(val) || '-',
     },
     {
       field: 'updaterName',

--
Gitblit v1.9.3