new version
Merge branch 'master' of https://github.com/guoylyy/waterMonitor
new version