Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

guoyuji

2024-04-16 329e41ccb0cd24d102b8d5c6db5c167ca01da857

 north-glass-erp/target/classes/mapper/mm/BasicWarehouseType.xml

@@ -13,7 +13,11 @@
    </select>

    <select id="getBasicWarehouseType" >
        select * from mm.basic_warehouse_type where type=#{type};
        select * from mm.basic_warehouse_type where type regexp #{type} group by operate_type_name;
    </select>

    <select id="getBasicWarehouse" >
        select operate_type from mm.basic_warehouse_type where type regexp #{type};
    </select>