From f45bcaf01cd2c96e66b08d3f9b7287aa5b4cdab2 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 17 四月 2026 19:19:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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