Merge branch 'develop_new' into develop

app/views/student_work/_programing_work_show.html.erb

@@ -65,7 +65,7 @@
                                   <span class="w60 c_red">测试错误！</span>
                               <% end %>
                               <span class="w60">您的输出：</span>
-                              <span class="width120"><pre style="white-space: pre-wrap; margin-right: 15px;"><%=x["result"]%> </pre></span>
+                              <span class="width120"><pre style="white-space: pre-wrap; margin-right: 15px;"><%=x["result"].force_encoding("UTF-8")%> </pre></span>
                               <span class="w60">正确输出：</span>
 
                               <span  class="width120"><pre style="white-space: pre-wrap; margin-right: 15px;"><%=x["output"]%></pre></span>