fix java sdk  总  or and 的关系
Merge branch 'dev'