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

guoyuji

2024-03-15 3c87c3ff67c2193ab5bfaa31f0fb1ad5a68cd5af

 north-glass-erp/src/main/resources/mapper/sd/BasicData.xml

@@ -10,6 +10,14 @@
            basic_data as a
        where a.basic_type=#{type}
    </select>
    <select id="getOrderBasicDataByTypeAndChildType">
        select
            *
        from
            basic_data as a
        where a.basic_type=#{type} and a.basic_category = #{childType}
    </select>

    <select id="getOrderBasicDataType">
        select
            a.basic_category