Merge remote-tracking branch 'origin/master'

zhoushihao

2025-10-23 261698358e2b756a61e992bc1651e01b3f45290b

 hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowGlassQueueInfoMapper.xml

@@ -9,7 +9,7 @@
                   LEAST(width, height)                                             AS height,
                   relation_id,
                   ROW_NUMBER() OVER ( PARTITION BY cell ORDER BY hollow_sequence ) AS rn
            FROM `hollow_glass_queue_info`
            FROM hollow_glass_queue_info
            WHERE state = - 1
        ),
             glass_id_temp AS (SELECT * FROM queue_temp WHERE rn = 1),
@@ -19,6 +19,5 @@
                           WHERE t1.state = 1)
        SELECT glass_id
        FROM task_temp
        WHERE height > 2500
    </select>
</mapper>