Merge remote-tracking branch 'origin/master'

rk

7 小时以前 55642c818f14bf8cf52c98e6858014bd8dc3d3a7

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

@@ -122,4 +122,12 @@
        return ApiResponse.success(null);
    }

    @ApiOperation("手动触发订单结算")
    @PostMapping("/settle")
    @RequiresPermissions("business:orders:update")
    public ApiResponse settleOrders() {
        ordersService.settleOrders();
        return ApiResponse.success("结算完成");
    }

}