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

guoyujie

2 天以前 c4b9a339caff12e95f61c3d5dc950aafcc8c566c

 north-glass-erp/src/main/java/com/example/erp/service/sd/BasicDateService.java

@@ -31,7 +31,7 @@
    public Map<String, List<Object>> getOrderBasicData() {
        //获取订单基本数据类型
        //创建Map对象
        Map<String, List<Object>> orderBasicDataMap = new HashMap<>(); ;
        Map<String, List<Object>> orderBasicDataMap = new HashMap<>();
        //创建List对象
        orderBasicDataMap = getBasicDataByType("order");