update LineService, add tests, edit hql query
Merge remote-tracking branch 'origin/develop' into develop
change hql query