Merge remote-tracking branch 'origin/master'

吴羡

2 天以前 1193ed5cf72c8d1093d0c061b9eefe61a28b0cb7

 src/views/CNAS/resourceDemand/device/component/management.vue

@@ -550,7 +550,7 @@
         page: {
            total: 0,
            size: 10,
            current: 0,
            current: 1,
         },
         tableLoading: false,
      }