Change && to || in TriggerObj cons judge.
Merge pull request #5665 from chengstory/ChangeCondsJudge

Change && to || in TriggerObj conditions judge.
Update CHANGELOG [ci skip]
Merge branch 'master' into master_nutty_modify_framework_for315