Merge branch 'yibin' into test

101captain

2022-01-18 b22bc1a0d7931c9e91b96f1cd7c1c1855ff69ebf

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

@@ -37,7 +37,7 @@
     * @param date
     * @return
     */
    BigScreenActivityLine selectActivityCountMonth(@Param("communityId")Long communityId, @Param("date")String date);
    BigScreenActivityLine selectActivityCountMonth(@Param("communityId")Long communityId, @Param("date")String date,@Param("year")String year);

    /**
     * 查询党员积分前3