main跳转
Merge remote-tracking branch 'origin/master'
findpwrone and findpwrtwoviewcontroller