Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

java110

2021-08-06 b5e47a74ad88c453bf82fb8b870b69ac9d45503f

 java110-db/src/main/resources/mapper/common/AdvertServiceDaoImplMapper.xml

@@ -276,10 +276,10 @@
            , t.view_type = #{viewType}
        </if>
        <if test="advertType !=null and advertType != ''">
            and t.advert_type = #{advertType}
            ,  t.advert_type = #{advertType}
        </if>
        <if test="pageUrl !=null and pageUrl != ''">
            and t.page_url= #{pageUrl}
            ,  t.page_url= #{pageUrl}
        </if>
        where 1=1
        <if test="advertId !=null and advertId != ''">