Merge remote-tracking branch 'origin/master'

liujie

2023-08-07 f5ca8f01cf6b8256a25e8c6838d805fe3fca43fc

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

@@ -42,7 +42,7 @@
        ) as aa order by aa.code
    </select>
    <select id="queryListOfpage" resultType="java.util.Map">
        SELECT id, cityManagerId, province, city, `name`
        SELECT `id`, `cityManagerId`, `province`, `city`, `name`
        from t_store
        where 1=1
        <if test="provinceCode != null">