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
@@ -325,7 +325,7 @@ class CustomerService
                $audit->status = 3;
                $audit->save();
            }
-            return $logic->forceDelete($params['id']);
+            return $logic->forceDelete($params['id'],$audit->remark);
        } else {
            if(!empty($audit)){
                $audit->status = 2;