Signed-off-by: xiaoping <xiaoping>

个人日报
Merge branch 'master' of https://github.com/CRM2014/cf into xiaoping
Merge branch 'master' of https://github.com/CRM2014/cf into xiaoping
Signed-off-by: xiaoping <xiaoping>

基本 Dao层
Merge branch 'master' of https://github.com/CRM2014/cf into xiaoping
Signed-off-by: 陈释荣<11301119@bjtu.edu.cn>
销售机会，开发计划界面修改
Signed-off-by: lovewindy <1063652094@qq.com>
Merge branch 'windy' of git@github.com:CRM2014/cf.git
action 搭建完成
Merge branch 'Csrr' of git@github.com:CRM2014/cf.git

Conflicts:
	WebContent/html/marketing.chance/list.html
	WebContent/html/marketing.plan/execute.html
	WebContent/html/marketing.plan/list.html
	WebContent/html/marketing.plan/make.html
Merge branch 'LiuMengYing' of git@github.com:CRM2014/cf.git
Merge branch 'wpy' of git@github.com:CRM2014/cf.git
统计
Merge commit 'f2a1994e555ccf8ea87b8ffd614baf39605ff1e0'
Merge branch 'qiyu'

Conflicts:
	WebContent/html/statistics/contribution.html
dao
Signed-off-by: xiaoping <xiaoping>

DaoImpl部分
Signed-off-by: 陈释荣 <11301119@bjtu.edu.cn>
你懂得
图表
Merge branch 'qiyu'