Merge branch 'yuanke' into develop

app/views/attachments/_show_attachment_history.html.erb

@@ -1,7 +1,7 @@
 <!--<div class="resourceUploadPopup">-->
 <span class="uploadDialogText">更新资源版本</span>
 <!--<div class="resourcePopupClose"> <a href="javascript:void(0);" class="resourceClose" onclick="closeModal();"></a></div>-->
-<div class="uploadBoxContainer mt0">
+<div>
   <div>
     <div>当前版本
             <span class="attachment" >