Merge branch 'master' into test

CeDo

2021-06-08 fc855f524ba0c8dc3222da76d28b38afbac69fe0

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbMemberDAO.java

@@ -154,6 +154,9 @@
            "<if test='pagePartyBuildingMemberVO.auditStatus != null'>" +
            " and m.audit_result = #{pagePartyBuildingMemberVO.auditStatus}"+
            " </if> " +
            "<if test='pagePartyBuildingMemberVO.communityId != null'>" +
            " and m.community_id = #{pagePartyBuildingMemberVO.communityId}"+
            " </if> " +
            " order by m.join_time desc "+
            "</script>")
    IPage<PartyBuildingMemberVO> pagePartyBuildingMembersVO(Page page, @Param("pagePartyBuildingMemberVO") PagePartyBuildingMemberVO pagePartyBuildingMemberVO);