update email

Signed-off-by: WilliamChinese <linqingchinese@163.com>
更新日志

Signed-off-by: WilliamChinese <linqingchinese@163.com>
Merge branch 'study' of ssh://git@github.com/TrailsNanJing/gpj into
study

Conflicts:
	study_plan_logs.xls