Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms

xiaoyong931011

2022-07-07 b9fe4f29593fa980684b37085d3a440bb872356c

 src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/UserServiceImpl.java

@@ -424,6 +424,7 @@

        QueryWrapper<ArticleEntity> articleQueryWrapper = new QueryWrapper<>();
        articleQueryWrapper.eq("company_id",companyId);
        articleQueryWrapper.eq("del_status",ArticleEntity.DELETE_STATUS_NO);
        adminHomePageInfoVo.setArticleNum(articleMapper.selectCount(articleQueryWrapper));

        QueryWrapper<MessageBoardEntity> messageQueryWrapper = new QueryWrapper<>();