From 9f3f31e66b2ffb217155b9bcd294da4ec12b6e34 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 16 十月 2023 15:38:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs' into tzskasrs

---
 src/main/webapp/static/js/order/out.js |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index bfe89c1..ac322ac 100644
--- a/src/main/webapp/static/js/order/out.js
+++ b/src/main/webapp/static/js/order/out.js
@@ -39,6 +39,8 @@
             // ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
             // ,{field: 'qty', align: 'center',title: '浣滀笟鏁伴噺', style: 'font-weight: bold'}
             ,{field: 'enableQty', align: 'center',title: '寰呭嚭鏁伴噺', style: 'font-weight: bold'}
+            ,{field: 'color', align: 'center',title: '閿�鍞鍗曞彿'}
+            ,{field: 'origin', align: 'center',title: '閿�鍞鍗曡鍙�'}
             // ,{field: 'name', align: 'center',title: '鍚嶇О'}
             // ,{field: 'model', align: 'center',title: '閫氱敤鍨嬪彿'}
             ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}

--
Gitblit v1.9.1