修正因为id重复导致的校验问题
Merge remote-tracking branch 'remote/master'