历史订单完成，交往记录仍是半成品
Merge commit '0ee5e565f3461487e374bce1b848beed4e32ce7e'
Merge commit 'ad98bcd0f7c81b61c682bff5e68cb8ab7891e931'
log4j.properties
数据字典问题
修改BaseAction.java
CRM/WebContent/view/customer/basic/list.jsp
添加服务
log4j