diff --git a/src/views/system/device/detail.vue b/src/views/system/device/detail.vue
index f733f52..e5d275e 100644
--- a/src/views/system/device/detail.vue
+++ b/src/views/system/device/detail.vue
@@ -27,10 +27,10 @@
         </el-descriptions-item>
         <el-descriptions-item label="所属商户">{{deviceData.userName | defaultValue}}</el-descriptions-item>
         <el-descriptions-item label="店铺名称">{{deviceData.storeName | defaultValue}}</el-descriptions-item>
-        <el-descriptions-item label="断电方式">
-          <dict-tag v-if="deviceData.outageWay != null" :options="dict.type.sm_device_outage_way" :value="deviceData.outageWay" size="mini"/>
-          <template v-else>--</template>
-        </el-descriptions-item>
+<!--        <el-descriptions-item label="断电方式">-->
+<!--          <dict-tag v-if="deviceData.outageWay != null" :options="dict.type.sm_device_outage_way" :value="deviceData.outageWay" size="mini"/>-->
+<!--          <template v-else>&#45;&#45;</template>-->
+<!--        </el-descriptions-item>-->
         <el-descriptions-item label="WIFI">{{deviceData.wifi | defaultValue}}</el-descriptions-item>
         <el-descriptions-item label="剩余时长">{{surplusTime | defaultValue}} 分钟</el-descriptions-item>
         <el-descriptions-item label="实时功率">{{deviceData.realTimePower | defaultValue}} KWH</el-descriptions-item>
diff --git a/src/views/system/device/index.vue b/src/views/system/device/index.vue
index 5a91b8f..30c409e 100644
--- a/src/views/system/device/index.vue
+++ b/src/views/system/device/index.vue
@@ -225,14 +225,9 @@
               <el-input v-model="form.deviceNo" placeholder="请输入设备SN" />
             </el-form-item>
           </el-col>
-          <el-col :span="span">
-            <el-form-item label="所属用户" prop="userId">
-              <user-input v-model="form.userId" @change="onChangeUser"/>
-            </el-form-item>
-          </el-col>
           <el-col :span="span">
             <el-form-item label="店铺" prop="storeId">
-              <store-input v-model="form.storeId" :query="storeQuery" :before-open="beforeOpenStore"/>
+              <store-input v-model="form.storeId" />
             </el-form-item>
           </el-col>
           <el-col :span="span">
@@ -319,9 +314,6 @@ export default {
         modelId: [
           { required: true, message: "型号不能为空", trigger: "change" }
         ],
-        userId: [
-          { required: true, message: "商户不能为空", trigger: "change" }
-        ],
         deviceName: [
           { required: true, message: "设备名称不能为空", trigger: "change" }
         ],
@@ -349,27 +341,11 @@ export default {
         return getWxIndexUrl({ mac: mac});
       }
     },
-    // 店铺查询条件
-    storeQuery() {
-      return {
-        userId: this.form.userId
-      }
-    },
   },
   created() {
     this.getList();
   },
   methods: {
-    onChangeUser(user) {
-      this.form.storeId = null;
-    },
-    beforeOpenStore() {
-      if (this.form.userId == null) {
-        this.$message.warning("请先选择用户")
-        return false;
-      }
-      return true;
-    },
     handleBindSn(row) {
       this.form.deviceId = row.deviceId;
       this.showBindSn = true;