Merge branch 'feature/user0812' into develop_bm

# Conflicts:
#	app/admin/service/UserService.php
#	config/route.php
This commit is contained in:
2025-08-13 09:51:26 +08:00
14 changed files with 379 additions and 8 deletions
+2 -1
View File
@@ -55,7 +55,8 @@ class UserValidate extends Validate
'feishu_register' => ['feishu_code'],
'upwd_login' => ['account' => 'require|checkAccount', 'password'],
'feishu_auth' => ['corp_abbr', 'system_code', 'login_type'],
'feishu_login' => ['feishu_code']
'feishu_login' => ['feishu_code'],
'password' => ['password'],
];
/**