Signed-off-by: 陈释荣 <11301119@bjtu.edu.cn>
营销管理的开发计划部分添加.entityDevelopment.java未修改。
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
有错，不开心
历史订单完成，交往记录仍是半成品
Merge commit '0ee5e565f3461487e374bce1b848beed4e32ce7e'
Merge commit 'ad98bcd0f7c81b61c682bff5e68cb8ab7891e931'
log4j.properties
数据字典问题
修改BaseAction.java
CRM/WebContent/view/customer/basic/list.jsp
添加服务
log4j
服务分配
Signed-off-by: lovewindy <1063652094@qq.com>