From 03eacd4a03e29dd20380eca4d8a86c46c7f7f9b7 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Mon, 22 Jul 2019 10:43:27 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_tiddings_list.erb | 2 +-
 public/update.html                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/users/_user_tiddings_list.erb b/app/views/users/_user_tiddings_list.erb
index 4795fc6e..e4374eaf 100644
--- a/app/views/users/_user_tiddings_list.erb
+++ b/app/views/users/_user_tiddings_list.erb
@@ -27,7 +27,7 @@
               <span class="edu-filter-btn ml20 <%= tids.status == 0 ? 'edu-filter-btn-red' : tids.status == 1 ? 'edu-filter-btn-green' : "" %>"><%= tids.status == 0 ? '待处理' : tids.status == 1 ? '已处理' : "" %></span>
             <% end %>
           </p>
-          <p class="color-grey-6 break_word_firefox" style="word-break: break-word;"><%= tids.container_type == "StudentJoinCourse" ? tids.user.try(:show_name) : "" %><%= message_content(tids.key_word).html_safe %></p>
+          <p class="color-grey-6 break_word_firefox" style="word-break: break-word;"><%= tids.container_type == "StudentJoinCourse" ? tids.user.try(:show_name) : "" %><%= message_content(tids.keyx_word).html_safe %></p>
         </div>
         <% if @onclick_time < tids.created_at %>
           <span class="new-point fr mr40 mt22"></span>
diff --git a/public/update.html b/public/update.html
index be1b5d84..71bd6e1a 100644
--- a/public/update.html
+++ b/public/update.html
@@ -56,7 +56,7 @@ If you continue to experience problems please contact your Trustie administrator
             温馨提示:为了给大家提供更优质的服务
         </p>
         <p class="font-18">
-            平台拟于<span style="color: red">2019年7月19日21:30--2019年7月20号22:30</span>进行全面升级，带来不便，敬请谅解！
+            平台拟于<span style="color: red">2019年7月22日10:40--2019年7月22号11:00</span>进行全面升级，带来不便，敬请谅解！
         </p>
     </div>
 </body>