Merge remote-tracking branch 'origin/master'

wangfei

2025-02-17 59ad6aed9fc23a494e597eb1dfc30d46dbdd068c

 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