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

huanghongfa

2021-10-08 715e3dba8ac771a4dbe88925c907ed3cef31a8b7

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

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActFourMemberMapper.xml

@@ -29,7 +29,7 @@
                and t.community_id =#{commonPage.paramId}
            </if>
            <if test="commonPage.position !=null and commonPage.position !=''">
                and t.position like concat(#{commonPage.position},'%')
                and t.position like concat('%',#{commonPage.position},'%')
            </if>
            <if test="commonPage.keyword !=null and commonPage.keyword !=''">
                and (t1.name like concat(#{commonPage.keyword},'%') or t1.phone like concat(#{commonPage.keyword},'%') or t.jurisdiction_content like concat('%',#{commonPage.keyword},'%'))