Signed-off-by: 陈释荣 <11301119@bjtu.edu.cn>
个人日报，增加明日计划部分
同行评审
Merge commit '01d24f427e32337aa1cf79a7d2886317e2d2d697'
Merge commit '582a47bcc8cd2450094364e46e003d4e6083cdc7'
Merge branch 'qiyu'
移动Html到静态页面
规范英文名
评审/同行评审记录.xls
权限管理
Signed-off-by: xiaoping <xiaoping>
Merge branch 'master' of https://github.com/CRM2014/cf into xiaoping
权限管理模块
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