Merge branch 'master' into test

puhanshu

2021-12-30 a7002e25ec105e5f73c27f91944f1c0b4991c355

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWorkGuideServiceImpl.java

@@ -159,7 +159,9 @@
        if (!iPage.getRecords().isEmpty()) {
            iPage.getRecords().forEach(comActWorkGuideVO -> {
                ComActWorkGuideClassifyDO comActWorkGuideClassifyDO = comActWorkGuideClassifyDAO.selectById(comActWorkGuideVO.getClassify());
                comActWorkGuideVO.setClassifyName(comActWorkGuideClassifyDO.getClassifyName());
                if (comActWorkGuideClassifyDO != null) {
                    comActWorkGuideVO.setClassifyName(comActWorkGuideClassifyDO.getClassifyName());
                }
            });
        }
        return R.ok(iPage);