resolve merge conflict

yfx

2026-03-13 5414134d9358f675d0dd74587646afc065a949a9

1
2
3
4
5
6
7
8
export default {
    props: {
        bgColor: {
            type: String,
            default: 'transparent'
        }
    }
}