Merge branch 'develop' into standalone_develop

2023-12-14 11:47:48 +08:00 · 2023-12-14 11:47:48 +08:00 · a2ca6bd91b
parent 8be254710e 129970a525
commit a2ca6bd91b
1 changed files with 1 additions and 1 deletions
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@ -222,7 +222,7 @@ class AccountsController < ApplicationController
  end

  def change_password 
-    return render_error("两次输入的密码不正确") if params[:password].to_s != params[:new_password_repeat].to_s
+    return render_error("两次输入的密码不一致") if params[:password].to_s != params[:new_password_repeat].to_s
    @user = User.find_by(login: params[:login])
    return render_error("此用户禁止修改密码！") if @user.id.to_i === 104691
    return render_error("未找到相关用户!") if @user.blank?