Merge remote-tracking branch 'origin/master'

doum

10 小时以前 59b1f0e9967902aa10f5e017d5a0bdfd1b60c9ea

 server/admin/src/main/java/com/doumee/api/business/PricingRuleController.java

@@ -42,7 +42,7 @@
    @Autowired
    private PricingRuleService pricingRuleService;

    @PreventRepeat
    /*@PreventRepeat
    @ApiOperation("新建")
    @PostMapping("/create")
    @RequiresPermissions("business:pricingRule:create")
@@ -99,7 +99,7 @@
    @RequiresPermissions("business:pricingRule:query")
    public ApiResponse findById(@PathVariable Integer id) {
        return ApiResponse.success(pricingRuleService.findById(id));
    }
    }*/

    @PreventRepeat
    @ApiOperation("批量保存就地存取规则")
@@ -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));
    }