Merge pull request #3 from dolymood/master

merge miaodian branch
'submit'
Merge pull request #4 from dolymood/master

bill bug fix
submit
'test'
submit
submit
Merge pull request #4 from quyatong/master

j