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

huang

2024-12-02 911ea91bf388a124e15b6fe4d1884231fe117b07

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

@@ -95,7 +95,7 @@
            //将数据放入List中
            BasicDataMap.get(item.getBasicCategory()).add(item);
        }
        BasicDataMap.put("deliveryOtherMoney", Collections.singletonList(basicOtherMoneyMapper.selectList(null)));
        BasicDataMap.put("deliveryOtherMoney", Collections.singletonList( basicOtherMoneyMapper.selectList(new QueryWrapper<BasicOtherMoney>().eq("state",1))));
        return BasicDataMap;
    }