From 334fbd5f1a5a4e85c198560bd024211ba4cf99b1 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 11 三月 2024 18:27:27 +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 |    1 +
 1 files changed, 1 insertions(+), 0 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 eb4ebef..46adbc8 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
@@ -120,6 +120,7 @@
                 storeConfigVo.setBackgroundImage(worldCupStore.getBackgroundImage());
                 storeConfigVo.setType(9);
                 storeConfigVo.setIsOpen(worldCupStore.getIsOpen());
+                storeConfigVo.setSort(worldCupStore.getSort());
                 listVo.add(storeConfigVo);
             }
 

--
Gitblit v1.7.1