Commit d050f880 authored by 刘予佳's avatar 刘予佳

合并

parent ec2a7c95
...@@ -51,15 +51,6 @@ export default { ...@@ -51,15 +51,6 @@ export default {
auditStatus: "", // 0 待审核 1 已审核 auditStatus: "", // 0 待审核 1 已审核
listLoading: false, listLoading: false,
tableData: [ tableData: [
<<<<<<< HEAD
{
"unionName": "合肥高新附院",
"unionId": "2",
"reportTime": "2023-02-09 10:27:22",
"unCheckNums": 7,
"checkNums": 0
}
=======
// { // {
// unionId: "2", // unionId: "2",
// unionName: "合肥高新附院", // unionName: "合肥高新附院",
...@@ -67,7 +58,6 @@ export default { ...@@ -67,7 +58,6 @@ export default {
// checkNums: 0, // checkNums: 0,
// reportTime: "2022-12-09 09:12:35", // reportTime: "2022-12-09 09:12:35",
// }, // },
>>>>>>> remotes/origin/dev
], ],
} }
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment