Merge remote-tracking branch 'origin/master'

liujie

2023-08-04 1f9d05fd255fbd21356dad37527c7d33fda4fb8b

 cloud-server-management/src/main/resources/mapper/TStoreMapper.xml

@@ -41,4 +41,21 @@
        group by cityCode
        ) as aa order by aa.code
    </select>
    <select id="queryListOfpage" resultType="java.util.Map">
        SELECT id, cityManagerId, province, city, `name`
        from t_store
        where 1=1
        <if test="provinceCode != null">
            and provinceCode = #{provinceCode}
        </if>
        <if test="cityCode != null">
            and cityCode = #{cityCode}
        </if>
        <if test="cityManagerId != null">
            and cityManagerId = #{cityManagerId}
        </if>
        <if test="storeName != null and storeName != ' '">
            and `name` like CONCAT('%',#{storeName},'%')
        </if>
    </select>
</mapper>