Merge remote-tracking branch 'origin/master'

ZengTao

2025-11-29 4dc1abb37aec033fdbd09d290c6f62d082ba774a

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

@@ -196,6 +196,13 @@
        on t.flow_card_id = t1.flow_card_id and t.hollow_sequence = t1.hollow_sequence
        where t.state = 100
        and t.flow_card_id = #{flowCardId}
        <if test="list != null and list.size() > 0">
            and t.layer in (
            <foreach collection="list" item="item" separator=",">
                #{item}
            </foreach>
            )
        </if>
        )
        select *
        from result_detail