Merge branch 'feature-2023-12-data-rank' into 'master'

如果是前端传了门店id参数，则用前端的

See merge request !1613

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/data/DataController.java

@@ -338,7 +338,7 @@ public class DataController {
         String apolloKey = qo.getApolloKey();
 
         boolean notNeedStoreIdParam = "data_store_rank_index_info".equals(apolloKey);
-        if (notNeedStoreIdParam) {
+        if (notNeedStoreIdParam && !hasStoreId) {
             jsonObject.remove("storeId");
         }