Merge branch 'test' into 'master'

罗元桥

2021-05-13 7034041e18f2354ac0f4b852f17a09b2144e1091

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

@@ -161,7 +161,7 @@
        }else{
            List<Long> areaIds = comCvtBusinessAreaService.getBusinessServiceAreaIds(comCvtBusinessDO.getId());
            if(!ObjectUtils.isEmpty(areaIds)){
                List<ComActDO> busiDO = comActDAO.selectBatchIds(areaIds);
                comActDOS = comActDAO.selectBatchIds(areaIds);
            }
        }