瀏覽代碼

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.idea/workspace.xml
邪性 3 年之前
父節點
當前提交
f89b41bdca
共有 2 個文件被更改,包括 53 次插入794 次删除
  1. 52 793
      .idea/workspace.xml
  2. 1 1
      h_exam/exam_detail.html

File diff suppressed because it is too large
+ 52 - 793
.idea/workspace.xml


+ 1 - 1
h_exam/exam_detail.html

@@ -144,7 +144,7 @@
               </div> -->
             </div>
           </div>
-          <p>诚实做人、诚信考试!请勿购买考试答案,避免上当受骗!</p>
+          <p class="foot">诚实做人、诚信考试!请勿购买考试答案,避免上当受骗!</p>
           <!-- 点赞 阅读数 -->
           <div id="read" class="my-read">
             <div class="good"><i data-good="false" style="margin-right: 5px;"

Some files were not shown because too many files changed in this diff