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

chenlu

2024-05-22 b4d9093f066e750c3f623d5eb2e130532bb2fba6

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

@@ -90,6 +90,7 @@
            //将数据放入List中
            BasicDataMap.get(item.getBasicCategory()).add(item);
        }
        BasicDataMap.put("deliveryOtherMoney", Collections.singletonList(basicOtherMoneyMapper.selectList(null)));
        return BasicDataMap;
    }