Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

guoyuji

2024-04-26 684399b665ef8c25c43faff0fdc821a0b72b39ba

 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;
    }