Merge branch 'master' of http://47.107.245.0:3000/xiongxing/kyj-yanglao-web-new

src/views/system/bedManage/bedSetting/Form.vue

@@ -8,7 +8,7 @@
               <el-input
                 v-model="dataForm.buildName"
                 style="margin: 0 0; padding: 0 0"
-                :maxlength="6"
+                :maxlength="20"
               />
             </el-form-item>
           </el-col>

src/views/system/bedManage/bedSetting/RoomForm.vue

@@ -273,7 +273,7 @@
             <el-row v-show="!item.isDelete">
               <el-col :xs="23" :sm="23" :md="23" :lg="11" :xl="11">
                 <el-form-item label="床位号" prop="bedName">
-                  <el-input v-model="item.bedName" :maxlength="6" />
+                  <el-input v-model="item.bedName" :maxlength="20" />
                 </el-form-item>
               </el-col>
               <el-col :xs="23" :sm="23" :md="23" :lg="11" :xl="11">