Merge remote-tracking branch 'origin/master'

wu

2024-08-06 6f88e39b13f09decfdac0d31887a4e7c34629fc6

 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/mapper/DownStorageCageDetailsMapper.xml

@@ -28,7 +28,7 @@
        FROM DOWN_STORAGE_CAGE_DETAILS
        WHERE STATE = 100
        and (FLOW_CARD_ID, LAYER) not in (
        select FLOW_CARD_ID, LAYER from down_workstation where workstation_id in
        select FLOW_CARD_ID, LAYER from down_workstation where flow_card_id is not null and workstation_id not in
        <foreach collection="workList" item="item" open='(' close=')' separator=','>
            #{item}
        </foreach>