http://key@gitlab.egolm.com/hanxu/siff-film-api.git

Conflicts:
	pom.xml
	src/main/resources/application-dev.properties
	src/main/resources/application-pro.properties
	src/main/resources/application.properties