Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises

liuyg

2021-08-28 10f5e94e652d70e71e990cfe9b0b29019a7af28d

Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises

 src/views/securityEquipment/equipments.vue

@@ -26,7 +26,6 @@
            >删 除
          </el-button>
          <el-button
            style="display:none"
            type="success"
            size="small"
            plain

 src/views/securityUnitChild/data.js

@@ -220,6 +220,7 @@
        prop: "cardid",
        labelWidth: w,
        span: s,
        search: true
    }, {
        label: "联系电话",
        prop: "cell",