Merge remote-tracking branch 'origin/master'

puzhibing

2023-05-18 53562814add61acfdc02d6b25dae6324f6fd5f92

 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/AdvertisementMapper.xml

@@ -41,7 +41,15 @@
          and `type` = #{type}
        </if>
        <if test="null != city">
            and cityId in (select id from t_city where englishName in
            and cityId in (select id from t_city where chineseName in
            <foreach collection="city" item="item" index="index" open="(" separator="," close=")">
                #{item}
            </foreach>
            or englishName in
            <foreach collection="city" item="item" index="index" open="(" separator="," close=")">
                #{item}
            </foreach>
            or frenchName in
            <foreach collection="city" item="item" index="index" open="(" separator="," close=")">
                #{item}
            </foreach>