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

fengjin

2022-09-29 5dbdeef3fc01ba86c2d39f7e8eeebcb22e1bfcfb

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

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

@@ -46,7 +46,7 @@
        password,status,del_flag,
        create_time,create_by,update_time,
        introduction,street_id,industry_center_id,
        param1,unit from com_sanshuo_expert
        unit_id,unit from com_sanshuo_expert
        where del_flag=1
            <if test="keyWord != null and keyWord != ''">
                AND unit like concat('%',#{keyWord},'%')
@@ -71,6 +71,8 @@
        where t.level=2 and t.status=1 and t.del_flag=1
        group by t1.name
    </select>


    <select id="selectExpertStreet" resultType="com.panzhihua.common.model.vos.sanshuo.ExpertShowVO">
        select  count(t.id) as 'count',t1.name,t1.street_id as id from com_sanshuo_expert t
        left join com_street t1 on t.street_id=t1.street_id