Merge branch 'develop'
# Conflicts: # app/admin/controller/dashboard/FinStatisticsController.php # app/common/controller/FinPaymentApplyController.php # app/common/controller/FinReceiptController.php # app/common/logic/FinReceiptLogic.php # app/common/model/FinPaymentApply.php # app/common/model/FinReceipt.php # app/common/service/FinPaymentApplyService.php # app/common/service/FinReceiptService.php # app/common/service/StockOrdersService.php # config/route.php
This commit is contained in:
+1
-1
@@ -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