Commit b3dac5a4 authored by zhengke's avatar zhengke

修改

parent 732670cf
......@@ -1207,7 +1207,7 @@
}).catch((e) => {
if (e.Code == 0) {
//注释 不要删
//this.conflictData = e.Data;
this.conflictData = e.Data;
}
});
})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment