Merge remote-tracking branch 'origin/test' into txb

tangxiaobao

2021-09-06 a18634e047b46e411dac268a0b3a995c22053ea5

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

@@ -324,7 +324,7 @@

    @Override
    public R getNoRegistLists(ComActActRegistVO comActActRegistVO) {
        return null;
        return R.ok(comActActRegistDAO.getNoRegistLists(comActActRegistVO));
    }

    @Override