修复ShipInfo重复记录的bug。
Merge remote-tracking branch 'origin/bugfix-shipinfo-trash' into develop