fix
finshed the merge
fix checkbox can not selected all