在edit work order 页面能够添加log
Merge remote-tracking branch 'origin/master'

Conflicts:
	ea-core/.classpath
	ea-core/src/main/java/com/app/common/activiti/action/TaskLogAction.java
	ea-core/src/main/resources/struts-common.xml