From c51ab886ca899243f36cffe6c1a86d19057d44f5 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期六, 02 十一月 2024 11:18:38 +0800
Subject: [PATCH] 合并代码，解决冲突
---
src/main/webapp/static/js/orderTable.js | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/webapp/static/js/orderTable.js b/src/main/webapp/static/js/orderTable.js
index 450fd13..5bcda8d 100644
--- a/src/main/webapp/static/js/orderTable.js
+++ b/src/main/webapp/static/js/orderTable.js
@@ -40,7 +40,7 @@
defaultToolbar: [],
cols: [[
{type: 'checkbox'},
- {field: 'orderTime', title: '鏃ユ湡'},
+ {field: 'createTime$', title: '鏃ユ湡'},
{field: 'orderNo', title: '鍗曟嵁缂栧彿', align: 'center'}
]],
done: function (res, curr, count) {
--
Gitblit v1.9.1