add learngit1---dev
merge fix learngit1&learngit2