From c560f1a14ae1fc468d90e50e6a32d805295875da Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 01 九月 2025 15:35:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java
index 146520a..24c18f3 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java
@@ -33,7 +33,6 @@
@Autowired
private StoreService storeService;
-
@Autowired
private GDMapGeocodingUtil gdMapGeocodingUtil;
@@ -42,6 +41,14 @@
@Autowired
private TBackRecordService backRecordService;
+
+ @Autowired
+ private TStoreOtherConfigTrueService tStoreOtherConfigTrueService;
+
+
+
+
+
/**
* 获取根据门店id 获取店长信息
@@ -408,12 +415,13 @@
}
}
- @Autowired
- private TStoreOtherConfigTrueService tStoreOtherConfigTrueService;
+
+
+
@ResponseBody
@PostMapping("/base/store/queryIndexSet")
- @ApiOperation(value = "获取门店首页设置 2.0", tags = {"APP-免费福利"})
+ @ApiOperation(value = "获取门店首页设置", tags = {"APP-免费福利"})
@ApiImplicitParams({
@ApiImplicitParam(value = "门店id", name = "id", dataType = "int", required = true),
})
@@ -431,6 +439,7 @@
tStoreOtherConfigTrue.setSort(tStoreOther.getSort());
}
}
+ tStoreOtherConfigTrue.setDisplayType(2);
}
return ResultUtil.success(tStoreOtherConfigTrues);
} catch (Exception e) {
--
Gitblit v1.7.1