Merge branch 'refs/heads/master' into cc_20251112_wallet

# Conflicts:
#	coolstore-partner-web/src/main/resources/application-ab.properties
#	coolstore-partner-web/src/main/resources/application-test.properties

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

@@ -279,7 +279,9 @@
         from
         xfsg_shop_info a
         left join store_${enterpriseId} b on a.shop_code = b.store_num
-        where b.store_id is not null and a.id in
+        where a.shop_code is not null
+        and a.shop_code !=''
+        and b.store_id is not null and a.id in
         <foreach collection="shopIds" item="shopId" separator="," open="(" close=")">
             #{shopId}
         </foreach>