Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxingli...

MrShi

14 小时以前 e50954f0708ecbbc672352102ae3b24279d40cc1

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