From 03baf3dc978f9e71d9e96a45978a42b932fbd505 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 27 九月 2024 09:53:56 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

---
 hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/mapper/RawGlassStorageStationMapper.xml |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/mapper/RawGlassStorageStationMapper.xml b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/mapper/RawGlassStorageStationMapper.xml
index d1a6d99..1b7b53f 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/mapper/RawGlassStorageStationMapper.xml
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/mapper/RawGlassStorageStationMapper.xml
@@ -11,6 +11,7 @@
         <result column="films_id" property="filmsId"/>
         <result column="create_time" property="createTime"/>
         <result column="remain_quantity" property="remainQuantity"/>
+        <result column="enable_state" property="state"/>
     </resultMap>
 
 
@@ -22,7 +23,8 @@
                T1.PATTERN_THICKNESS,
                T1.FILMS_ID,
                T1.CREATE_TIME,
-               T1.REMAIN_QUANTITY
+               T1.REMAIN_QUANTITY,
+               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

--
Gitblit v1.8.0