From e589ffc0b6009b3c69bb356a9ed102773cfb8474 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期六, 02 十一月 2024 10:19:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxgtasrs' into jxgtasrs
---
src/main/webapp/static/js/order/order.js | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 8a807c3..7b6cbb3 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -48,6 +48,7 @@
{field: 'createTime$', title: '鍒涘缓鏃堕棿', minWidth: 200, width: 200},
{field: 'settle$', align: 'center', title: '鐘舵��', templet: '#settleTpl', minWidth: 160, width: 160},
{field: 'shipName', align: 'center',title: '鍒跺崟浜�'},
+ {field: 'itemName', align: 'center',title: '浠撳簱'},
{field: 'memo', align: 'center',title: '澶囨敞', hide: true},
{align: 'center', title: '鎿嶄綔', toolbar: '#operate', width: 180}
]],
--
Gitblit v1.9.1