Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuish...

fengjin

2022-11-17 0430cf26ba8646c65ffb1d1a0fbdb191a8c29d74

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

@@ -692,7 +692,7 @@
        having serviceTimes<>'' and serviceTime<>''
        order by serviceTimes desc
    </select>
    <select id="selectCount" resultType="Integer">
     <select id="selectCount" resultType="Integer">
        select count(id)  from com_act_neighbor_circle
        <where>
            <if test="type!=null">