dev add 777777...
fenzhi1 add 8888...
master add 999....
conflict fixed
add merge
merge with no-ff
fix bug
merge bug fixed