feat:合并

This commit is contained in:
岳佳鑫
2022-11-03 17:49:33 +08:00
parent 45674ecbd3
commit 88f3750d8e

View File

@@ -557,11 +557,6 @@ import * as apieval from "../../api/indexEval";
import * as apiinvist from "../../api/indexInvist";
import * as apivote from "../../api/indexVote";
import * as apistage from "../../api/indexStage";
<<<<<<< HEAD
import * as apistage from "../../api/indexStage";
=======
import * as apivote from "../../api/indexVote";
>>>>>>> 096d42b09e588582d20dd3350d5115d6678da009
const drawercolumns = [
{
title: "项目名称",