是否删除数据
Merge branch 'master' into chende
。
Merge branch 'chenyan'

Conflicts:
	src/com/chainton/pdm/data/model/RelatedDevice.java
添加设备关联表 delete字段
Merge branch 'chende'

Conflicts:
	src/com/chainton/pdm/data/model/RelatedDevice.java
修改