aidlab/aida_back
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev/dev' into develop

Browse Source 
# Conflicts:
#	docker-compose.yml
This commit is contained in:
shahaibo
2023-12-13 17:26:48 +08:00
parent a14188ee35 b71a1c834d
commit 79cff13edb
6 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/resources/messages_en.properties
View File

@@ -136,7 +136,7 @@ priority.cannot.be.repeated=priority cannot be repeated.
# 当用户输入不符合预设规则时，比如格式错误或者值的范围不正确，这种错误通常可以由用户自行更正。
userName.does.not.exist=Username or password is incorrect. Please check your entry and try again.
password.error=Username or password is incorrect. Please check your entry and try again.
email.error=Email format is incorrect. Please enter a valid email address.
email.error=Email is incorrect, please enter the correct bound email.
email.does.not.exist=Email address does not exist in our records. Please check and try again.
the.verification.code.has.expired=Verification code has expired. Please request a new code to proceed.
verification.code.error=Verification code entered is incorrect. Please check and try again.