From cfa7d0a90e7da9b52606ab8fca364fa5bddddcd4 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期四, 28 八月 2025 20:14:15 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0 --- cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods.js | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods.js b/cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods.js index f00f8ff..5d80600 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tGoods/tGoods.js @@ -41,9 +41,9 @@ }, {title: '发放数量', field: 'quantityIssued', visible: true, align: 'center', valign: 'middle' }, - {title: '限领数量', field: 'hasPickQty', visible: true, align: 'center', valign: 'middle' + {title: '限领数量', field: 'pickUpQuantity', visible: true, align: 'center', valign: 'middle' }, - {title: '已领数量', field: 'pickUpQuantity', visible: true, align: 'center', valign: 'middle' + {title: '已领数量', field: 'hasPickQty', visible: true, align: 'center', valign: 'middle' }, {title: '已兑换数量', field: 'hasExchangeQty', visible: true, align: 'center', valign: 'middle' }, -- Gitblit v1.7.1