Merge branch 'master' of http://bore.pub:10439/r/ERP_override

廖井涛

2024-05-31 fda672b4fd0ef3bd4f0759e5c58fdca8f243e550

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