deleteUI OK
deleteUI ok
f
Merge branch 'future_deleteUI'
ok
向uitype中新增了一行代码
冲突产生
uitype新增语句
Merge branch 'dev' of github.com:mistkafka/GitTest into dev

Conflicts:
	UIFactory.java
	UIType.java
修改了UIfactory
修改了错误