Merge remote-tracking branch 'origin/master'

于杰

2025-11-04 7cf8f8fc1abca63423c1fb4618363f8a9d283f9d

 north-glass-erp/src/main/resources/mapper/mm/BasicWarehouseType.xml

@@ -20,6 +20,7 @@
        select operate_type from mm.basic_warehouse_type where type regexp #{type};
    </select>


    <select id="getBasicWarehouseTypeAll" >
        select * from mm.basic_warehouse_type where type!=#{originalFilm} and type!=#{accessories}  order by id desc;
    </select>