Merge branch 'develop' into standalone_develop

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?