From ba4f03556d24a1548de75c8219cbc3f06e4ff57c Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期一, 11 八月 2025 16:31:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml b/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
index fe665f2..81b7d6e 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
@@ -1233,6 +1233,7 @@
patch_state,
mark_icon,
isRotate,
+ glass_point,
rack_no
) VALUES (
#{projectId},
@@ -1251,6 +1252,7 @@
#{glass.patchState},
#{glass.markIcon},
#{glass.isRotate},
+ #{glass.glassPoint},
#{glass.rackNo}
);
</foreach>
@@ -1827,6 +1829,7 @@
y_axis AS y,
mark_icon AS markIcon,
isRotate,
+ glass_point AS glassPoint,
rack_no As rackNo
FROM
pp.optimize_detail
--
Gitblit v1.8.0