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

chenlu

2024-05-21 18fb477ea840e3dd4b19ff63f68f994d31fab43b

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