mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git
synced 2025-12-15 13:56:45 +08:00
feat:合并
This commit is contained in:
@@ -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: "项目名称",
|
||||
|
||||
Reference in New Issue
Block a user