Merge remote-tracking branch 'origin/dev' into dev

k94314517

2023-09-15 64f45c75ea93911b9841bf00bb4c436cd294be3a

 server/service/src/main/java/com/doumee/service/business/impl/BaseCategoryServiceImpl.java

@@ -209,7 +209,14 @@
    @Override
    public List<BaseCategory> findList(BaseCategory baseCategory) {
        QueryWrapper<BaseCategory> wrapper = new QueryWrapper<>(baseCategory);
        return baseCategoryMapper.selectList(wrapper);
        List<BaseCategory> list = baseCategoryMapper.selectList(wrapper);
        list.forEach(i->{
            i.setImgfullurl(
                systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode() +
                            systemDictDataBiz.queryByCode(Constants.OSS,Constants.CATEGORY_IMG).getCode() + i.getImgurl()
            );
        });
        return list;
    }

    @Override