解决冲突

liuyg

2021-06-17 3c3d6b18872b4a56e1e6b3682f6ceb5b1b4069a2

1
2
//>>built
define({buttonOk:"\u062d\u0633\u0646\u0627",buttonCancel:"\u0627\u0644\u063a\u0627\u0621",buttonSave:"\u062d\u0641\u0638",itemClose:"\u0627\u063a\u0644\u0627\u0642"});