Merge remote-tracking branch 'origin/master' into master

hhhyyq

2021-03-17 45e45ff70ba7cd7889f76cbf489d6bf012a4f84d

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

@@ -32,20 +32,19 @@
//            " </where>" +
//            "</script>")

    @Select("<script> " +
            "SELECT\n" +
            "m.id,\n" +
            "me.NAME,\n" +
            "u.phone,\n" +
            "m.create_at registrationTime \n" +
            "FROM\n" +
            "com_pb_activity_member m\n" +
            "JOIN com_pb_member me ON m.member_id = me.id\n" +
            "LEFT JOIN sys_user u ON me.id_card = u.id_card \n" +
            "WHERE\n" +
            "m.activity_id = #{pageActivityMembersVO.activityId} \n" +
    @Select("<script>  " +
            "SELECT " +
            " m.id," +
            " m.NAME," +
            " u.phone," +
            " m.create_at registrationTime" +
            " FROM " +
            " com_pb_activity_member m " +
            " LEFT JOIN sys_user u ON m.user_id = u.user_id " +
            "WHERE " +
            "m.activity_id = #{pageActivityMembersVO.activityId} " +
            "<if test='pageActivityMembersVO.name != null and pageActivityMembersVO.name.trim() != &quot;&quot;'>" +
            "AND me.`name` = #{pageActivityMembersVO.name} \n" +
            "AND m.`name` = #{pageActivityMembersVO.name} " +
            " </if> " +
            "<if test='pageActivityMembersVO.phone != null and pageActivityMembersVO.phone.trim() != &quot;&quot;'>" +
            "AND u.phone = #{pageActivityMembersVO.phone}" +