Merge remote-tracking branch 'origin/bugfix'

src/components/icss/AddMedicalName.vue

@@ -233,6 +233,7 @@
                 <span class="necess">*</span>
                 <el-input
                         v-model.trim="description"
+                         maxLength ='7'
                         placeholder="请输入填写单患者界面展示通俗内容"
                 ></el-input>
             </el-form-item>
@@ -242,7 +243,7 @@
                     prop="explains"
                     class="marT"
             >
-                <el-input type="textarea" v-model.trim="explains" maxLength ='100' style="width: 500px;"></el-input>
+                <el-input type="textarea" v-model.trim="explains" maxLength ='100' style="width: 500px;" :rows="4"></el-input>
             </el-form-item>
           </el-form> 
         </div>