From 8f8dab10c3e39e908e33149cce50060a4cb94e66 Mon Sep 17 00:00:00 2001
From: xxq250 <xxq250@qq.com>
Date: Wed, 23 Nov 2022 17:58:51 +0800
Subject: [PATCH] =?UTF-8?q?fixed=20=E5=A2=9E=E5=8A=A0emoji=E8=A1=A8?=
 =?UTF-8?q?=E6=83=85=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/user.rb                                 | 3 ++-
 db/migrate/20221123023450_update_user_nick_name.rb | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 62eeb77ee..fc0911d03 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -190,7 +190,8 @@ class User < Owner
            :show_email, :show_location, :show_department, :super_description, :show_super_description,
            :technical_title, :province, :city, :custom_department, to: :user_extension, allow_nil: true
 
-  before_save :update_hashed_password, :set_lastname
+  # before_save :update_hashed_password, :set_lastname
+  before_save :update_hashed_password
   after_save :reset_cache_data
   after_create do
     SyncTrustieJob.perform_later("user", 1) if allow_sync_to_trustie?
diff --git a/db/migrate/20221123023450_update_user_nick_name.rb b/db/migrate/20221123023450_update_user_nick_name.rb
index 0910b7397..0759f9291 100644
--- a/db/migrate/20221123023450_update_user_nick_name.rb
+++ b/db/migrate/20221123023450_update_user_nick_name.rb
@@ -17,5 +17,7 @@ class UpdateUserNickName < ActiveRecord::Migration[5.2]
 
     execute("ALTER TABLE `commit_logs` MODIFY `message` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;")
 
+    execute("ALTER TABLE `user_extensions` MODIFY `description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;")
+
   end
 end