Merge branch '4G_PingFeng' of http://git.fast-fun.cn:92/RuiLiWuLian/4G into 4G_PingFeng

# Conflicts:
#	src/AppTaskUart1.c