解决冲突

liuyg

2021-06-17 3c3d6b18872b4a56e1e6b3682f6ceb5b1b4069a2

1
2
//>>built
define({buttonOk:"\u0920\u0940\u0915 \u0939\u0948",buttonCancel:"\u0930\u0926\u094d\u0926 \u0915\u0930\u0947\u0902",buttonSave:"\u0938\u0939\u0947\u091c\u0947\u0902",itemClose:"\u092c\u0902\u0926 \u0915\u0930\u0947\u0902"});