Merge branch 'szzh' into dev_hjq

app/views/users/user_messages.html.erb

@@ -34,7 +34,7 @@
 </div>
 <div class="resources mt10" id="users_setting">
   <div>
-    <% if (!@message_alls.nil? && @message_alls.count >0) || (!@user_system_messages.nil? && @user_system_messages.count >0) %>
+    <% if (!@message_alls.nil? && @message_alls.count >0) %>
         <% if params[:type].nil? || params[:type] == "unviewed" %>
             <div class="newsReadSetting">
               有&nbsp;<span class="c_red"><%= unviewed_message(@user) %></span>&nbsp;条未读