Merge branch 'west_bigscreen_dev' into 'master'

罗元桥

2021-12-14 ecde7a30a43e3d45be2f0f9e271d0abf02c7d58e

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActFourMemberDao.java

@@ -26,4 +26,5 @@
     */
    IPage<ComActFourMemberVO> pageList(Page page, @Param("commonPage")CommonPage commonPage);
    ComActFourMemberVO getById(Integer id);
    ComActFourMemberVO getByIdVillage(Integer id);
}