From 8785b6b5ee9298308752b53bf546953ae49b8c88 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期一, 21 十月 2024 09:56:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/mapper/RawGlassStorageStationMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/mapper/RawGlassStorageStationMapper.xml b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/mapper/RawGlassStorageStationMapper.xml
index 1b7b53f..56c2e88 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/mapper/RawGlassStorageStationMapper.xml
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/mapper/RawGlassStorageStationMapper.xml
@@ -4,7 +4,7 @@
<resultMap id="baseMap" type="com.mes.rawglassdetails.entity.RawGlassStorageDetails">
<result column="device_id" property="deviceId"/>
- <result column="slot" property="slotId"/>
+ <result column="slot" property="slot"/>
<result column="pattern_width" property="patternWidth"/>
<result column="pattern_height" property="patternHeight"/>
<result column="pattern_thickness" property="patternThickness"/>
@@ -27,7 +27,7 @@
T.ENABLE_STATE
FROM RAW_GLASS_STORAGE_STATION T
LEFT JOIN RAW_GLASS_STORAGE_DETAILS T1 ON T.DEVICE_ID = T1.DEVICE_ID
- AND T.SLOT = T1.SLOT_ID
+ AND T.SLOT = T1.SLOT
AND T1.STATE = 100
</select>
</mapper>
--
Gitblit v1.8.0