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

chenlu

2024-03-13 033fb309b323e1e6b50d79bc6dd628d427e3ac11

 north-glass-erp/src/main/java/com/example/erp/mapper/sd/BasicDateMapper.java

@@ -14,4 +14,5 @@
    List<BasicData> getOrderBasicData(String type);
    List<String> getOrderBasicDataType(String type);

    List<BasicData> getOrderBasicDataByTypeAndChildType(String type, String childType);
}