Merge branch 'master' of https://sinanoaq.cn:8888/r/hazmat_manage

“djh”

2025-03-04 48bdd6d0b6c13c99dfc8ec5801d70a056d9db315

 hazmat-system/src/main/resources/mapper/system/HzWarehouseMapper.xml

@@ -88,6 +88,14 @@
            #{warehouse}
        </foreach>
    </select>


    <select id="selectByCupboardIds" resultType="com.gkhy.hazmat.system.domain.HzWarehouseCupboard">
        select id,cupboard_name from hz_warehouse_cupboard where del_flag=0 and  id in
        <foreach collection="ids" item="id" open="(" separator="," close=")">
            #{id}
        </foreach>
    </select>
    <select id="selectByWarehouseIdAndCupboardName" resultType="com.gkhy.hazmat.system.domain.HzWarehouseCupboard">
        SELECT
            id,