Merge branch 'master' of /data/git/tiantian2

app/Http/Controllers/Manager/OrdersController.php

@@ -736,8 +736,8 @@ class OrdersController extends CommonController
      *     description="交互流程如下：初次请求带上just_check参数，将返回to_recharge_total值；如果to_recharge_total大于0表示需要充值，充值完成之后，去除just_check参数再次提交；如果to_recharge_total <= 0，直接去除just_check参数再次提交",
      *     @OA\Parameter(name="token", in="query", @OA\Schema(type="string"), required=true, description="token"),
      *     @OA\Parameter(name="order_id", in="path", @OA\Schema(type="integer"), required=true, description="订单id"),
-     *     @OA\Parameter(name="to_date", in="query", @OA\Schema(type="date"), required=true, description="结算到的日子")
-     *     @OA\Parameter(name="just_check", in="query", @OA\Schema(type="boolean"), required=false, description="是否只是check一下要多少钱")
+     *     @OA\Parameter(name="to_date", in="query", @OA\Schema(type="date"), required=true, description="结算到的日子"),
+     *     @OA\Parameter(name="just_check", in="query", @OA\Schema(type="boolean"), required=false, description="是否只是check一下要多少钱"),
      *     @OA\Response(
      *      response="200",
      *      description="中途结算",
@@ -758,7 +758,7 @@ class OrdersController extends CommonController
      *                     @OA\Property(
      *                         property="to_recharge_total",
      *                         type="decimal",
-     *                         description=""
+     *                         description="需要充值的金额"
      *                     ),
      *                      @OA\Property(
      *                         property="updated_items",