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

liuleilei

2023-09-11 faf1d3cc35a3a5f83558946c8056537a4d77fa1f

 server/src/main/java/doumeemes/service/ext/impl/CategoryExtServiceImpl.java

@@ -49,6 +49,12 @@
    }

    @Override
    public List<CategoryExtListVO> findList(QueryCategoryExtDTO queryCategoryExtDTO) {
        List<CategoryExtListVO> result = categoryExtMapper.selectList(queryCategoryExtDTO);
        return result;
    }

    @Override
    public List<CategoryExtListVO> getListByType(String type,Integer rootDepartId,String cateType,String id) {
        QueryCategoryExtDTO queryCategoryExtDTO=new QueryCategoryExtDTO();
        queryCategoryExtDTO.setDeleted(Constants.ZERO);