Merge branch 'master' of https://gitee.com/youlaiorg/vue3-element-admin
# Conflicts: # src/components/Upload/ImageUpload.vue
This commit is contained in:
@@ -126,7 +126,7 @@ const props = defineProps({
|
||||
*/
|
||||
uploadMaxSize: {
|
||||
type: Number,
|
||||
default: 2 * 1048 * 1048,
|
||||
default: 2 * 1024 * 1024,
|
||||
},
|
||||
/**
|
||||
* 上传文件类型
|
||||
|
||||
Reference in New Issue
Block a user