合并冲突

shuishen

2021-06-03 cd411e7b3ade23951e8935924252f7059cc096d5

1
2
//>>built
define({setButtonText:"\u8a2d\u5b9a",cancelButtonText:"\u30ad\u30e3\u30f3\u30bb\u30eb"});