备忘录优化
from master
 Merge branch 'wxd' into 'master'

Wxd
模版
模版2
 Merge branch 'blithe' into 'master'

Blithe
任务和项目优化
merge from master
日历工作报告
 Merge branch 'blithe' into 'master'

Blithe
我的培训记录
Merge remote-tracking branch 'origin' into MacIvan
 Merge branch 'wxd' into 'master'

Wxd
选项问卷
 Merge branch 'blithe' into 'master'

Blithe
我的培训记录课程表单
Merge remote-tracking branch 'origin' into MacIvan
修复签到的时间判断问题，并优化进出详情页面。
Merge branch 'master' of staffonly.zhisiyun.com:nick/zhisiyun-mobile