Signed-off-by: jinxitao <jxt@yaozheng.com.cn>


Signed-off-by: jinxitao <jxt@yaozheng.com.cn>
Merge branch 'master' of https://github.com/sgewuhan/pm.git

Conflicts:
	com.sg.business.model/src/com/sg/business/model/Organization.java
	com.sg.business.model/src/com/sg/business/model/RoleDefinition.java
	com.sg.business.model/src/com/sg/business/model/WorkDefinition.java
	com.sg.business.model/src/com/sg/business/model/WorkDefinitionConnection.java
Merge branch 'master' of https://github.com/sgewuhan/pm.git