解决冲突

liuyg

2021-09-16 b93a670eb02613d9ce82e4cca02f9435cdd855b4

 src/views/exam/startexam.vue

@@ -76,7 +76,7 @@
                class="start-kaoshi"
                v-if="permission.startexam_applyPapers"
                @click="startExam(row)"
                >报名清册
                >报名清册详情
              </el-button>
            </template>
          </avue-crud>
@@ -281,8 +281,8 @@
            display: false,
          },
          {
            label: "备注",
            prop: "remark",
            label: "报名人数",
            prop: "num",
            span: 24,
            slot: true,
            // 表单新增时是否禁止