bug fixes

src/modules/viewer/components/work/chapterWork.vue

@@ -13,11 +13,7 @@
         ></exam-item>
       </el-form>
     </div>
-<<<<<<< HEAD
-    <p style="color: red" v-if="deadline">请于截止日期 {{ deadline }} 前提交</p>
-=======
     <p style="color: red" v-if="deadline">{{ $t('viewerWork.deadline', { deadline }) }}</p>
->>>>>>> master
     <!-- 驳回状态 -->
     <template v-if="detail && detail.status === 1">
       <div class="work-bottom">