Merge remote-tracking branch 'origin/master'

rk

2026-04-23 3696830fbaf2fd97d98020087abf20917e491bdc

 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));
    }