[bug]修复水贴判断
Merge branch 'bug' into dev