Merge remote-tracking branch 'origin/master'

# Conflicts:
#	entry/src/main/ets/pages/testImageKnifeLoadState.ets
#	entry/src/main/resources/base/profile/main_pages.json
This commit is contained in:
任伟x 2024-05-20 09:52:50 +08:00
commit 55da882e5e
1 changed files with 1 additions and 1 deletions

View File

@ -42,7 +42,7 @@ struct testImageKnifeCache {
return data; return data;
}, },
onLoadFailed: (err) => { onLoadFailed: (err) => {
console.log('Load Failed Reason: ' + err); console.error('Load Failed Reason: ' + err);
} }
} }
} }