Merge branch 'develop' into feature/mzl_dev

# Conflicts: # .gitignore # composer.lock
2025-12-02 14:17:25 +08:00
parent d53f18181a
commit 32a7752f8b
21 changed files with 838 additions and 35 deletions
@@ -21,12 +21,13 @@ class CustomerLogic
        return $res;
    }

-    public function forceDelete(int $id)
+    public function forceDelete(int $id ,string $status_desc = '')
    {
        $customer = Customer::withTrashed()->find($id);
        //强制删除
 //        $res = $customer->forceDelete();
        $customer->status = 3;
+        $customer->status_desc = $status_desc;
        $res = $customer->save();
        return $res;
    }