Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

chenlu

2024-03-29 6c17e1f3da486ffd16b7237d9bc35a9bcbef5348

 north-glass-erp/src/main/resources/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=#{type};
    </select>