解决冲突

liuyg

2021-06-17 3c3d6b18872b4a56e1e6b3682f6ceb5b1b4069a2

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