From af0f58e4b39a363b73587fa1b4cce7be46e203f5 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期五, 12 九月 2025 15:07:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/cms/mapper/xml/CuttingReceiveDetailMapper.xml | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/cms/mapper/xml/CuttingReceiveDetailMapper.xml b/src/main/java/org/jeecg/modules/cms/mapper/xml/CuttingReceiveDetailMapper.xml
index 643a8fc..1211c04 100644
--- a/src/main/java/org/jeecg/modules/cms/mapper/xml/CuttingReceiveDetailMapper.xml
+++ b/src/main/java/org/jeecg/modules/cms/mapper/xml/CuttingReceiveDetailMapper.xml
@@ -9,9 +9,10 @@
t1.cutting_id cuttingId,
t1.workpiece_material workpieceMaterial,
t1.used_life usedLife,
- t2.cutting_barcode cuttingCBarcode,
+ t2.cutting_barcode cuttingBarcode,
t2.inventory_status inventoryStatus,
t2.current_life currentLife,
+ t2.id inventoryId,
t3.cutting_code cuttingCode,
t3.cutting_name cuttingName
FROM
--
Gitblit v1.9.3