Merge branch 'dev_local' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_local

db/seeds.rb

@@ -11,7 +11,7 @@ user_params = [
     {
         id: 1,
         login: 'educoder',
-        hashed_password: 'be23da3a28946db0eb0c5e62964cf7669621977a',
+        hashed_password: '6763c9a6d5c201903feed5950a2c4459cef8d3ec',
         lastname: '社区导师',
         mail: '721773699@qq.com',
         admin: 1,
@@ -22,7 +22,7 @@ user_params = [
         show_realname: '社区导师',
         professional_certification: 1,
         certification: 1,
-        salt: '7af297891a2a81231445b0dfb1b2eaa6',
+        salt: '3dce3e3983227c40c48a25419d41de7e',
         profile_completed: 1
     },
     {