Merge branch 'master' into VERSIONS-FenJiFenLei

src/views/iotDevice/hardwareManagement/hardwareEquipment/index.vue

@@ -160,11 +160,11 @@
                :rules="dialogRules" class="addCheckPage-min" label-width="120px">
         <el-form-item label="名称" prop="hardwareName">
           <el-input v-model="dialogForm.hardwareName" placeholder="请输入名称"
-                    maxLength="10" style="width:320px;"/>
+                    maxLength="20" style="width:320px;"/>
         </el-form-item>
         <el-form-item label="编号" prop="hardwareNo">
           <el-input v-model="dialogForm.hardwareNo" :disabled="!!dialogForm.id"
-                    placeholder="请输入编号" maxLength="10" style="width:320px;"/>
+                    placeholder="请输入编号" maxLength="50" style="width:320px;"/>
         </el-form-item>
         <el-form-item label="类型" prop="hardwareTypeId">
           <el-select v-model="dialogForm.hardwareTypeId" placeholder="请选择类型"