解决冲突

liuyg

2021-06-19 66f2854366a59a2194ac51e67e5c6ddc29b20ff3

1
2
//>>built
define({CarouselPrevious:"\u4e0a\u4e00\u6b65",CarouselNext:"\u4e0b\u4e00\u6b65",PageIndicatorLabel:"\u7b2c $0 \u9875\uff08\u5171 $1 \u9875\uff09"});