Merge branch 'master' of ssh://118.31.104.155:4422/mnt/git/v2.tiantianxinye.365care

app/Http/Controllers/Manager/OrdersController.php

@@ -874,7 +874,7 @@ class OrdersController extends CommonController
         }
 
         $manager = $this->guard()->user();
-//        if (!$manager->no_lock_ability) { //2023年8月份有开通一个功能，让具有权限的人可以修改往月的已扣款订单，后发现有问题，现在改为只可以对当月已扣款订单进行修改
+//        if (!$manager->no_lock_ability) { //2023年8月份有开通一个功能，让具有权限的人可以修改往月的已扣款订单，后发现有问题，现在改为只可以对当月或上月已扣款订单进行修改
         foreach ($order_items as $_item) {
             if ($_item->paid_at && $request->price && $_item->total != $request->price && date("Ym", strtotime($_item->service_date)) < date("Ym", strtotime("-1 month", time()))) {
                 $errors[] = "子订单{$_item->service_date}价格已锁定";