From 7ee466ebc953bb5640bcf42f2b8e2a87aa471c21 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 15 四月 2026 20:12:21 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
server/admin/src/main/java/com/doumee/api/business/PricingRuleController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/server/admin/src/main/java/com/doumee/api/business/PricingRuleController.java b/server/admin/src/main/java/com/doumee/api/business/PricingRuleController.java
index 452168f..8efa3d4 100644
--- a/server/admin/src/main/java/com/doumee/api/business/PricingRuleController.java
+++ b/server/admin/src/main/java/com/doumee/api/business/PricingRuleController.java
@@ -145,7 +145,7 @@
@ApiOperation("鏌ヨ棰勮鏃舵晥閰嶇疆")
@GetMapping("/estimatedDelivery/list")
@RequiresPermissions("business:pricingRule:query")
- public ApiResponse<EstimatedDeliveryVO> listEstimatedDelivery(@RequestParam Integer cityId) {
+ public ApiResponse<List<EstimatedDeliveryVO>> listEstimatedDelivery(@RequestParam Integer cityId) {
return ApiResponse.success(pricingRuleService.getEstimatedDelivery(cityId));
}
--
Gitblit v1.9.3