add function7
modify function7
modify function7 with 1234
Merge branch 'feature/function7' into develop