ok
ok2
123
Merge branch 'master' of https://github.com/hejiaming007/MovieTime.git

Conflicts:
	movietime-parent/pom.xml
	movietime-parent/readme.txt
	movietime-service/src/main/java/com/jimmystudio/movietime_service/entity/Comment.java
	movietime-service/src/main/java/com/jimmystudio/movietime_service/entity/Group.java
	movietime-service/src/main/java/com/jimmystudio/movietime_service/entity/Movie.java
	movietime-service/src/main/java/com/jimmystudio/movietime_service/entity/User.java
	movietime-service/src/main/java/com/jimmystudio/movietime_service/repository/MovieRepository.java
	movietime-service/src/main/java/com/jimmystudio/movietime_service/repository/UserRepository.java
	movietime-service/src/test/java/com/jimmystudio/movietime_service/repository/MovieRepositoryTest.java