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

puzhibing

2024-02-29 2679571358258ab0470280b9b225d1ba7c3bb585

 cloud-server-other/src/main/java/com/dsh/other/controller/StoreConfigController.java

@@ -120,6 +120,7 @@
                storeConfigVo.setBackgroundImage(worldCupStore.getBackgroundImage());
                storeConfigVo.setType(9);
                storeConfigVo.setIsOpen(worldCupStore.getIsOpen());
                storeConfigVo.setSort(worldCupStore.getSort());
                listVo.add(storeConfigVo);
            }