Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vben into dev

2025-10-10 21:44:32 +08:00
parent 691f9aa764 8465941011
commit 7ef1da4f2c
8 changed files with 54 additions and 22 deletions
--- a/apps/web-antd/src/views/pay/demo/order/data.ts
+++ b/apps/web-antd/src/views/pay/demo/order/data.ts
@@ -97,7 +97,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
      minWidth: 180,
      formatter: ({ cellValue, row }) => {
        if (cellValue) {
-          return formatDateTime(cellValue);
+          return formatDateTime(cellValue) as string;
        }
        if (row.payRefundId) {
          return '退款中，等待退款结果';