Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui

zhanghua

2022-11-29 d1c6fa3e2e7ef9a5009e798909ed80aecf2eb1db

 src/views/systemSetting/device/bayonet/index.vue

@@ -24,7 +24,7 @@
      <div class="main-content">
        <div class="main-title">
          <el-button
            class="el-icon-plus"
            class="el-icon-plus button-addition"
            type="primary"
            @click="showDialog(false, null)"
            >添加</el-button