Merge branch 'feature/fin' into develop
# Conflicts: # app/common/service/FinReceiptService.php
This commit is contained in:
+2
-2
@@ -429,8 +429,8 @@ Route::group('/admin', function () {
|
||||
Route::any('/store', [app\common\controller\FinReceiptController::class, 'store']);
|
||||
Route::any('/update', [app\common\controller\FinReceiptController::class, 'update']);
|
||||
Route::any('/payment', [app\common\controller\FinReceiptController::class, 'payment']);
|
||||
Route::any('/destroy', [app\common\controller\FinReceiptController::class, 'destroy']);
|
||||
Route::any('/credit', [app\common\controller\FinReceiptController::class, 'credit']);
|
||||
Route::any('/delete', [app\common\controller\FinReceiptController::class, 'delete']);
|
||||
});
|
||||
// 收款记录历史
|
||||
Route::group('/receipt/his', function () {
|
||||
@@ -448,7 +448,7 @@ Route::group('/admin', function () {
|
||||
Route::any('/show', [app\common\controller\FinPaymentApplyController::class, 'show']);
|
||||
Route::any('/store', [app\common\controller\FinPaymentApplyController::class, 'store']);
|
||||
Route::any('/update', [app\common\controller\FinPaymentApplyController::class, 'update']);
|
||||
Route::any('/destroy', [app\common\controller\FinPaymentApplyController::class, 'destroy']);
|
||||
Route::any('/delete', [app\common\controller\FinPaymentApplyController::class, 'delete']);
|
||||
});
|
||||
|
||||
// 系统配置
|
||||
|
||||
Reference in New Issue
Block a user