From 0aacd330fca570ab3350aef5bda901f23aee23b3 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 20 十一月 2024 13:51:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageCageMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageCageMapper.xml b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageCageMapper.xml
index f2cbc0a..4b0946d 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageCageMapper.xml
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageCageMapper.xml
@@ -16,7 +16,7 @@
left join edg_storage_cage_details t1 on t.slot = t1.slot
where t.device_id = #{deviceId}
and t1.state = 100
- and t.remain_width >= #{width}
+ and t.remain_width >= GREATEST(#{width}, #{height})
and t1.width = #{width}
and t1.height = #{height}
and t.enable_state = 1
--
Gitblit v1.8.0