Merge remote-tracking branch 'origin/developer' into developer

gic-store-service/src/main/resources/mapper/TabStoreInfoMapper.xml

@@ -381,10 +381,10 @@
       and t2.enterprise_id = #{store.enterpriseId}
     </if>
     <if test="store.cityId != null and store.cityId != ''">
-      and t2.city_id= #{store.cityId}
+      and t1.city_id= #{store.cityId}
     </if>
     <if test="store.storeBrandId != null">
-      and brand_ids like concat('%,', #{store.storeBrandId}, ',%')
+      and t1.brand_ids like concat('%,', #{store.storeBrandId}, ',%')
     </if>
     <if test="store.storeGroupIdList != null and store.storeGroupIdList.size()>0">
       and t2.store_group_id in