测试冲突解决

Signed-off-by: liuyajun <liuyajun52@gmail.com>
Merge branch 'master' of https://github.com/MD5TEAM/MD5PrivacySafe2.git