add function3
modifyu function3
Merge branch 'feature/function3' into develop