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

guoyujie

2025-12-12 130fe64dd3eb0617ddc1f38afcd07656d56db27c

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

@@ -9,6 +9,7 @@
        from
            basic_data as a
        where a.basic_type=#{type}
        order by sort
    </select>
    <select id="getOrderBasicDataByTypeAndChildType">
        select
@@ -45,7 +46,7 @@

    <select id="getBasicDataMaxSort">
        select
            max(sort)
            ifnull(max(sort),0)
        from
            basic_data as a
        where a.basic_category=#{type}