Merge remote-tracking branch 'origin/master'

src/components/ImageUpload/index.vue

@@ -42,7 +42,7 @@
           <div
             slot="error"
             class="image-slot"
-            style="width: 100%;height: 100%; border: 1px #DB4747;border-radius:5px;"
+            style="width: 100%;height: 100%; border: 1px solid  #DB4747;border-radius:5px;"
           >
             <div class="parent-container">
               <img

src/views/medical-record-management/medical-edit.vue

@@ -39,7 +39,7 @@ color: #333333;"
           :hide-required-asterisk="!isEdit"
           :rules="formRules"
           class="medical-detail__form"
-          label-width="120px"
+          label-width="115px"
           size="small"
         >
           <!--2--基本信息-->