Merge remote-tracking branch 'origin/huacheng_test' into huacheng

张天森

2022-07-18 2ccdf3184f80a49284b1137230e17189fa3ff965

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/UserDao.xml

@@ -707,5 +707,13 @@
            and t.create_at >= #{range}
        </if>
    </select>

    <select id="selectCommunityByStreetId" resultType="com.panzhihua.common.model.vos.user.CommunityVO">
        select community_id as id,name from com_act where street_id =#{id}
        <if test="type == 1">
            and name like concat('%','社区')
        </if>
        <if test="type == 2">
            and name like concat('%','村')
        </if>
    </select>
</mapper>