Merge branch 'cc_20250509_import_data' into 'master'

Cc 20250509 import data

See merge request hangzhou/java/custom_zxjp!74

coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml

@@ -501,7 +501,7 @@
     </update>
     <update id="updateShopCity">
         <foreach collection="list" item="item" index="index" separator=";">
-            update xfsg_shop_info set province =#{item.province}, city = #{item.city}, district=#{item.district} where id = #{item.id}
+            update xfsg_shop_info set   shop_name = #{item.shopName}, province =#{item.province}, city = #{item.city}, district=#{item.district},  detail_address = #{item.detailAddress} where id = #{item.id}
         </foreach>
     </update>
 </mapper>