Merge branch 'sanshuohuitang_dev' into huacheng_test

张天森

2022-09-28 b2a64967d13f68175cd0c47f1a5b6169c42ed8a9

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

@@ -196,7 +196,7 @@
    }

    @Override
    public R get(Integer id) {
    public R get(Long id) {
        return R.ok(comActFourMemberDao.getById(id));
    }