test ueditor
fix make patch issue
merge code