Merge remote-tracking branch 'origin/master'

luobisheng

2022-11-23 a4a9d6c03b724689ae74fe5f15149af89200b5de

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

@@ -118,8 +118,8 @@
    methods: {
      getBayonetListData() {
        bayonet.getBayonetList({ bayonetName: '', current: this.current, size: this.size })
            .then(data => {
              this.list = data;
            .then(({ records }) => {
              this.list = records;
            })
            .catch(err => {
              this.$message({ type: 'error', message: err });