diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index 2b706be7f..76467275d 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -1,4 +1,4 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
+<%= javascript_include_tag "/assets/kindeditor/kindeditor", '/assets/kindeditor/pasteimg' %>
 <div class="project_r_h">
   <h2 class="project_h2"><%= l(:label_issue_edit) %></h2>
 </div>
@@ -12,7 +12,6 @@
     <div class="ping_dispic">
       <%= link_to image_tag(url_to_avatar(@issue.author), :width => 46, :height => 46), user_path(@issue.author), :class => "ping_dispic" %>
     </div>
-
     <div class="talk_txt fl">
       <p class="pro_page_tit" style="word-break:break-all;">
         <span class='<%= "#{get_issue_type(@issue.tracker_id)[0]} fl" %>' title="<%= get_issue_type(@issue.tracker_id)[1] %>"></span>
@@ -21,59 +20,32 @@
       </p><br/>
 
       <div class="cl"></div>
-      由<a href="javascript:void(0)" class="problem_name"><%= @issue.author %></a>添加于 <%= format_time(@issue.created_on).html_safe %>
+      <p>由<a href="javascript:void(0)" class="problem_name"><%= @issue.author %></a>
+        <%# if @issue.created_on != @issue.updated_on %>
+        添加于 <%= format_time(@issue.created_on).html_safe %>
+        <%# else %>
+        <%#= format_time(@issue.updated_on).html_safe %>
+        <%# end %>
     </div>
-
     <!--talk_txt end-->
     <a href="javascript:void(0)" class="talk_edit fr"<%= render :partial => 'action_menu' %></a>
     <div class="cl"></div>
-    <% if @issue.description? || @issue.attachments.any? -%>
-        <div class="talk_info mb10" style="word-break:break-all;">
+    <div class="talk_info mb10 list_style" style="word-break:break-all;">
+      <% if @issue.description? || @issue.attachments.any? -%>
           <% if @issue.description? %>
               <%#= link_to l(:button_quote), quoted_issue_path(@issue.id), :remote => true, :method => 'post', :class => 'icon icon-comment' if authorize_for('issues', 'edit') %>
               <%= textAreailizable @issue, :description, :attachments => @issue.attachments %>
           <% end %>
-        </div>
-    <% end -%>
-
-    <div class="pro_pic_box mb10">
-      <a href="javascript:void(0)" class="link_img fl">
-        <!--显示附件、图片-->
-        <%= link_to_attachment_project @issue, :thumbnails => true %></a><br/>
+          </div>
+          <div class="pro_pic_box mb10">
+            <a href="javascript:void(0)" class="link_img fl">
+              <!--显示附件、图片-->
+              <%= link_to_attachment_project @issue, :thumbnails => true %></a><br/>
+      <% end -%>
       <%= call_hook(:view_issues_show_description_bottom, :issue => @issue) %>
-    </div><!--pro_pic_box  end-->
-    <div class="cl"></div>
-
-    <!--属性-->
-<<<<<<< .mine
-    <%= render :partial => 'attributes_show' %>
-    <!--pro_info_box 属性 end-->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-=======
+      </div><!--pro_pic_box  end-->
+      <div class="cl"></div>
+      <!--属性-->
       <div class="pro_info_box mb10">
         <%= issue_fields_rows do |rows| %>
             <ul class="fl">
@@ -101,18 +73,7 @@
               <% end %>
               <div class="cl"></div>
             </ul>
->>>>>>> .theirs
-
-<<<<<<< .mine
-    <%# 该应用是对issue主题内容的引用，对应:to => 'journals#new %>
-    <!--<div class="cl"></div>-->
-    <!--<%#= link_to l(:button_quote), quoted_issue_path(@issue.id), :remote => true, :method => 'post', :class => 'talk_edit fr' if authorize_for('issues', 'edit') %>-->
-
-
-
 
-    <div class="cl"></div>
-=======
             <ul class="fl ">
               <% unless @issue.disabled_core_fields.include?('start_date') %>
                   <li><p class="label03" style="width:50px;">&nbsp;开始&nbsp;&nbsp;:&nbsp;</p>
@@ -121,33 +82,6 @@
                   </li>
               <% end %>
               <div class="cl"></div>
->>>>>>> .theirs
-<<<<<<< .mine
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-=======
               <% unless @issue.disabled_core_fields.include?('estimated_hours') %>
                   <li><p class="label03" style="width:50px;">&nbsp;周期&nbsp;&nbsp;:&nbsp;</p>
                     <span class="pro_info_p"><%= l_hours(@issue.estimated_hours) %></span>
@@ -172,23 +106,28 @@
             <% end %><!--pro_info_box end-->
         <%#= render_custom_fields_rows(@issue) %>
         <%#= call_hook(:view_issues_show_details_bottom, :issue => @issue) %>
->>>>>>> .theirs
-  </div>
-
+      </div>
+      <!--pro_info_box 属性 end-->
+      <div class="cl"></div>
+      <%= link_to l(:button_quote), quoted_issue_path(@issue.id), :remote => true, :method => 'post', :class => 'talk_edit fr' if authorize_for('issues', 'edit') %></a>
+      <div class="cl"></div>
+      </div>
   <!--problem_main end-->
   <div style="clear: both;"></div>
-
   <!--留言-->
   <% if @issue.editable? %>
       <div id="update">
         <%= render :partial => 'edit' %>
       </div>
       <p style="padding-top: 5px"></p>
-      <%#--引用时不能修改，剥离出引用内容--%>
+
+      <!--引用时不能修改，剥离出引用内容-->
+
       <a remote="true" href="javascript:void(0)" class="blue_btn fr mr80" onclick="issue_desc_editor.sync();$('#issue-form').submit();">
         <%= l(:button_submit) %>
       </a>
   <% end %>
+
   <%#= submit_tag l(:button_submit) %>
   <%#= preview_link preview_edit_issue_path(:project_id => @project, :id => @issue), 'issue-form' ,'preview',{:class => "blue_btn fr mr10"}%>
 </div>
@@ -199,7 +138,6 @@
       <%= render :partial => 'changesets', :locals => {:changesets => @changesets} %>
     </div>
 <% end %>
-
 <div class="cl"></div>
 <% other_formats_links do |f| %>
     <%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
diff --git a/db/schema.rb b/db/schema.rb
index 40daded12..b364ed83e 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20150918134804) do
+ActiveRecord::Schema.define(:version => 20150924063215) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -476,6 +476,13 @@ ActiveRecord::Schema.define(:version => 20150918134804) do
 
   add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
 
+  create_table "discuss_demos", :force => true do |t|
+    t.string   "title"
+    t.text     "body"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
   create_table "documents", :force => true do |t|
     t.integer  "project_id",                :default => 0,  :null => false
     t.integer  "category_id",               :default => 0,  :null => false
@@ -895,6 +902,7 @@ ActiveRecord::Schema.define(:version => 20150918134804) do
     t.datetime "updated_on",                       :null => false
     t.boolean  "locked",        :default => false
     t.integer  "sticky",        :default => 0
+    t.integer  "reply_id"
   end
 
   add_index "messages", ["author_id"], :name => "index_messages_on_author_id"
@@ -912,7 +920,6 @@ ActiveRecord::Schema.define(:version => 20150918134804) do
     t.datetime "created_on"
     t.integer  "comments_count",               :default => 0,  :null => false
     t.integer  "course_id"
-    t.datetime "updated_on"
   end
 
   add_index "news", ["author_id"], :name => "index_news_on_author_id"
@@ -1324,7 +1331,7 @@ ActiveRecord::Schema.define(:version => 20150918134804) do
     t.datetime "updated_at",                                                       :null => false
     t.integer  "late_penalty",                                  :default => 0
     t.integer  "absence_penalty",                               :default => 0
-    t.float    "system_score",                                  :default => 0.0
+    t.integer  "system_score"
     t.boolean  "is_test",                                       :default => false
   end