modify log
modify log
Merge branch 'master' of github.com:songgz/shopror