Merge branch 'develop' into szzh

10 years ago · d237d37952
parent e22d2793c9 a6b6432320
commit d237d37952
2 changed files with 2 additions and 2 deletions
--- a/app/views/homework_common/index.html.erb
+++ b/app/views/homework_common/index.html.erb
@ -61,7 +61,7 @@
        <div class="mt5">
          <span class="tit_fb"  style="width: auto;"> 扣分标准：</span>
          <div class="fl mb5 c_red">
-            迟交扣分
+            迟交扣
            <%= homework.late_penalty%>
            分
            <% if homework.homework_type == 1%>
--- a/app/views/student_work/index.html.erb
+++ b/app/views/student_work/index.html.erb
@ -146,7 +146,7 @@
        <div class="mt5">
          <span class="tit_fb"  style="width: auto;"> 扣分标准：</span>
          <div class="fl mb5 c_red">
-            迟交扣分
+            迟交扣
            <%= @homework.late_penalty%>
            分
            <% if @homework.homework_type == 1%>