Merge branch 'master' of https://github.com/CRM2014/cf into SabrinaWang
Signed-off-by: SabrinaWang <673458347@qq.com>
注释例子
Merge branch 'qinhui' of git@github.com:CRM2014/cf.git
。。
Signed-off-by: xiaoping <xiaoping>

xml database和报表
Merge branch 'master' of https://github.com/CRM2014/cf into xiaoping
Merge commit '500f36288e1381d2b221b1313b440de3282559bc'
Merge commit '83549ee43dc5bfc2c7cbbaa5a0ff58ca249ac4a8'
Signed-off-by: 陈释荣 <11301119@bjtu.edu.cn>
Merge branch 'Csrr' of git@github.com:CRM2014/cf.git
Merge branch 'master' of https://github.com/CRM2014/cf into xiaoping
页面
Signed-off-by: lovewindy <1063652094@qq.com>
Merge branch 'master' of git@github.com:CRM2014/cf.git into qinhui
Signed-off-by: xiaoping <xiaoping>

增加
menu action连接
个人日报
Signed-off-by: xiaoping <xiaoping>

7.15个人日报
Signed-off-by: 陈释荣<11301119@bjtu.edu.cn>
上传个人日报
调整文档