Signed-off-by: 陈释荣 <11301119@bjtu.edu.cn>
营销管理的开发计划部分添加.entityDevelopment.java未修改。
Signed-off-by: lovewindy <1063652094@qq.com>
Merge commit '7c1ba02b7dbe86ab92efe8a04c5b1b03f3f18637'

Conflicts:
	src/cf/crm/action/marketing/ChanceAction.java
	src/cf/crm/action/marketing/PlanAction.java
	src/cf/crm/action/marketing/struts-marketing.xml