解决冲突

ZZJ

2022-07-28 abe3a86c15105f215992d78bcaaf9b51efa1d565

 src/views/equipmentManagement/equipmentList/components/Content.vue

@@ -194,7 +194,7 @@
        box-sizing: border-box;
        display: none;
        position: absolute;
        padding: 20px;
        padding: 20px 10px;
        top: 40px;
        left: -100px;
        width: 247px;