修复t_shjg的映射
增加.gitgnore的一些过滤

Signed-off-by: Michael <yidongnan@gmai.com>
Merge remote-tracking branch 'remotes/origin/master' into Michael