From faaf4ce0e117cd3f841fd06003e3dfdb2d0f7ebb Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 05 十一月 2025 15:13:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0

---
 cloud-server-other/src/main/java/com/dsh/other/controller/StoreConfigController.java |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/StoreConfigController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/StoreConfigController.java
index f02a264..b38837a 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/StoreConfigController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/StoreConfigController.java
@@ -116,10 +116,8 @@
                             storeConfigVo.setBackgroundImage("https://we-park-life.oss-cn-beijing.aliyuncs.com/img/0771fb3bd4de43c08492d0912209e51f.png");
                             break;
                         }
-
                     }
                 }
-
                 listVo.add(storeConfigVo);
             }
 
@@ -136,8 +134,6 @@
                 storeConfigVo.setSort(worldCupStore.getSort());
                 listVo.add(storeConfigVo);
             }
-
-
             //排序
             Collections.sort(listVo, new Comparator<StoreConfigVo>() {
                 @Override

--
Gitblit v1.7.1