Merge remote-tracking branch 'origin/master'

luobisheng

2022-11-29 1df9a311de3c8b31ae24ad95ba8194093fa30a43

Merge remote-tracking branch 'origin/master'

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

@@ -85,7 +85,7 @@
  data() {
    return {
      isShowDialog: false,
      context: 0,
      context: "",
      options: [
        {
          value: 0,
@@ -150,7 +150,7 @@
    getBayonetListData() {
      bayonet
        .getBayonetList({
          bayonetName: "",
          bayonetName: this.context,
          current: this.current,
          size: this.size,
        })