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

guoyuji

2024-05-31 3ee23fa2bfb5f90863a1e2579c882b4bae875aa3

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