提交添加业务数据对象属性代码
提交代码
提交代码
解决冲突
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	modules/foxbpm-engine/src/main/java/org/foxbpm/engine/impl/datavariable/BizDataObject.java