移动Html到静态页面
规范英文名
评审/同行评审记录.xls
权限管理
权限管理模块
Merge branch 'xiaoping' of git@github.com:CRM2014/cf.git

Conflicts:
	WebContent/view/common/menu.jsp
	src/cf/crm/action/account/struts-account.xml
	src/cf/crm/action/customer/struts-customer.xml
优化一些代码
修改配置文件
Signed-off-by: WpyOcean <wokunisa@163.com>
登录，检查登录
Signed-off-by: lovewindy <1063652094@qq.com>
有四个jsp和四个Action错误，是时间段选择的问题。交给宇神了啊
懒加载？
open session in view
Merge commit '1489d7719fd2595dc68a431a53f4b4e55dc4dc5e'

Conflicts:
	src/cf/crm/dao/impl/DaoAdapter.java
Merge commit 'a9af968a719936603f3067b8d1c86b9914c837ea'
服务
Signed-off-by: xiaoping <xiaoping>
Merge branch 'master' of https://github.com/CRM2014/cf into xiaoping
Signed-off-by: 刘梦莹 <11301099@bjtu.edu.cn>
交往记录与历史订单半成品
修改密码Bug