Merge remote-tracking branch 'origin/master'

liujie

2023-10-25 a1557f3f07287c86e8a4a408f03ba19993e5a48c

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

@@ -39,7 +39,7 @@
            return ResultUtil.paranErr("storeId");
        }
        try {
            List<StoreConfig> list = storeConfigService.list(new QueryWrapper<StoreConfig>().eq("storeId", storeId).orderByAsc("sort"));
            List<StoreConfig> list = storeConfigService.list(new QueryWrapper<StoreConfig>().eq("storeId", storeId).orderByAsc("sort").eq("isOpen",1));
            List<StoreConfigVo> listVo = new ArrayList<>();
            for (StoreConfig storeConfig : list) {
                StoreConfigVo storeConfigVo = new StoreConfigVo();