xinyouhe/fdesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/user0812

Browse Source 
# Conflicts:
#	app/admin/service/UserService.php
#	config/route.php
This commit is contained in:
WIN-C27C5MSVTPO\16961
2025-08-14 10:09:56 +08:00
parent d78567e780 f8da1a1a4b
commit f326665716
19 changed files with 881 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/route.php
+5 -2
View File
@@ -60,6 +60,9 @@ Route::group('/common', function () {
Route::any('/corps', [app\common\controller\PresetController::class, 'corps']);
Route::any('/feishu/app', [app\common\controller\PresetController::class, 'feishuApp']);
Route::any('/systems', [app\common\controller\PresetController::class, 'systems']);
Route::any('/roles', [app\common\controller\PresetController::class, 'roles']);
Route::any('/cache/clear', [app\common\controller\PresetController::class, 'cacheClear']);
Route::any('/menus', [app\common\controller\PresetController::class, 'menus']);
});
});
@@ -214,7 +217,7 @@ Route::group('/crm', function () {
Route::any('/upload/image', [app\common\controller\UploadController::class, 'uploadImage']);
Route::any('/user/edit', [app\common\controller\UserController::class, 'edit']);
Route::any('/user/savePassword', [app\common\controller\UserController::class, 'savePassword']);
Route::any('/user/edit', [app\common\controller\UserController::class, 'edit']);
Route::any('/user/savePassword', [app\common\controller\UserController::class, 'savePassword']);
});