Merge branch 'renhequ' into dev

101captain

2022-01-14 6fc1e7f179acaeec4df755f72895b3b4fb50d4bb

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

@@ -32,7 +32,7 @@
    // "</script>")
    @Select("<script> " + "SELECT\n" + "*,\n" + "TIMESTAMPDIFF(\n" + "YEAR,\n" + "t.birth_time,\n"
        + "DATE_FORMAT( NOW(), '%Y-%m-%d' )) age\n" + "FROM\n" + "com_pb_member_role t\n" + "WHERE\n"
        + "t.community_id = #{partyCommitteeVO.communityId} \n" + "</script>")
        + "t.community_id = ${partyCommitteeVO.communityId} \n" + "</script>")
    IPage<PartyCommitteeVO> pagePartyOrganization(Page page,
        @Param("partyCommitteeVO") PartyCommitteeVO partyCommitteeVO);