Merge remote-tracking branch 'origin/master'

Crunchy

2024-05-22 d8bb0e96fbbb763c623255629d623e7308ef5dee

 src/components/view/a6-device-management.vue

@@ -687,7 +687,7 @@
          this.$message.error('未输入启用日期')
          return
        }
        if(!this.formData.deviceStatus){
        if(this.formData.deviceStatus==='' || this.formData.deviceStatus===null){
          this.$message.error('未选择当前状态')
          return
        }