Merge branch 'master' into jenkins

src/school/school-detail/eidt-school.tsx

@@ -124,7 +124,7 @@ export default defineComponent({
                 <Image
                   width={50}
                   height={50}
-                  fix="cover"
+                  fit="cover"
                   class={styles.schoolICon}
                   src={forms.logo ? forms.logo : logoIcon}
                 ></Image>