add feature ececute one condition and modify log
Merge branch 'newissue' into develop