Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius into master

src/components/school/teacher/teacher-form.vue

@@ -38,7 +38,7 @@
           <div class="col-6 q-pb-lg">
             <q-uploader style="display: inline-block;height:320px; max-width: 100%;background-repeat:no-repeat"
               :style="{'background-image':'url(' + objOption.TeacherIcon + ')'}" max-files="1" hide-upload-btn
-              @rejected="onRejected" label="教师形象照" :max-file-size="512*1024" accept=".jpg, image/*" auto-upload
+              @rejected="onRejected" label="教师形象照" :max-file-size="5*1024*1024" accept=".jpg, image/*" auto-upload
               :factory="uploadFile" no-thumbnails @added="getType(2)">
             </q-uploader>
           </div>