Merge branch 'feature/fin' into develop

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

app/common/controller/FinPaymentApplyController.php

@@ -162,4 +162,20 @@ class FinPaymentApplyController extends BaseController
         $data['stock'] = array_values($stock);
         return $data;
     }
+
+    /**
+     * 作废
+     * @param Request $request
+     * @return \support\Response
+     */
+    public function delete(Request $request)
+    {
+        try {
+            $id = $request->input('id');
+            $raw = $this->service->delete($id);
+            return $this->success($raw);
+        } catch (\Throwable $e) {
+            return $this->error($e->getMessage());
+        }
+    }
 }

app/common/controller/FinReceiptController.php

@@ -41,22 +41,6 @@ class FinReceiptController extends BaseController
         }
     }
 
-    /**
-     * 确认入账
-     * @param Request $request
-     * @return \support\Response
-     */
-    public function delete(Request $request)
-    {
-        try {
-            $id = $request->input('id');
-            $raw = $this->service->delete($id);
-            return $this->success($raw);
-        } catch (\Throwable $e) {
-            return $this->error($e->getMessage());
-        }
-    }
-
     public function show(Request $request)
     {
         try {