Merge branch 'feature/fin' into develop

# Conflicts:
#	app/common/service/FinReceiptService.php

app/common/service/FinReceiptService.php

@@ -233,12 +233,6 @@ class FinReceiptService
             $query->where('submit_files','!=','');
         }
 
-        if(isset($param['scene']) && $param['scene'] == 'delete'){ //查询作废数据
-            $query->onlyTrashed();
-        }elseif (isset($param['scene']) && $param['scene'] == 'all'){ //查询包含作废数据的全量数据
-            $query->withTrashed();
-        }
-
         if (isset($param['scene']) && ($param['scene'] == 'list' ||$param['scene'] == 'pending')) {
             return $query->paginate($limit, ['*'], 'page', $page);
         }
@@ -299,13 +293,6 @@ class FinReceiptService
         return $res;
     }
 
-
-    public function delete($id)
-    {
-        $res = FinReceipt::where('id', $id)->delete();
-        return $res;
-    }
-
     /**
      * 更新：绑定收款记录，计算折让金额
      * @param Request $request