From 0e19bbb301fd4efdcbf3285ade2a149db7d0a613 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 15 八月 2025 18:34:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/jeecg/modules/cms/mapper/xml/CuttingToolMapper.xml |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/jeecg/modules/cms/mapper/xml/CuttingToolMapper.xml b/src/main/java/org/jeecg/modules/cms/mapper/xml/CuttingToolMapper.xml
index 09b40f2..ccfe624 100644
--- a/src/main/java/org/jeecg/modules/cms/mapper/xml/CuttingToolMapper.xml
+++ b/src/main/java/org/jeecg/modules/cms/mapper/xml/CuttingToolMapper.xml
@@ -15,6 +15,7 @@
         t1.cutting_model cuttingModel,
         t1.drawing_number drawingNumber,
         t1.inventory_warning inventoryWarning,
+        t1.remark remark,
         t2.item_text cuttingCategory
         FROM
         cms_cutting_tool t1

--
Gitblit v1.9.3