解决冲突

liuyg

2021-06-02 029883129b3014a8cbd694fe09409bf4379c2cc2

1
2
//>>built
define({buttonOk:"OK",buttonCancel:"\u30ad\u30e3\u30f3\u30bb\u30eb",buttonSave:"\u4fdd\u5b58",itemClose:"\u9589\u3058\u308b"});