Merge remote-tracking branch 'origin/master' into master

zengh

2020-11-13 8274f20d8093486dc3d54e074d25b6e412f4e4c7

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