Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.idea/workspace.xml
#	target/classes/com/example/cinema/bl/ScheduleServiceImpl.class

src/main/java/com/example/cinema/bl/AccountServiceImpl.java → src/main/java/com/example/cinema/blImpl/AccountServiceImpl.java

@@ -1,5 +1,6 @@
-package com.example.cinema.bl;
+package com.example.cinema.blImpl;
 
+import com.example.cinema.bl.AccountService;
 import com.example.cinema.data.AccountMapper;
 import com.example.cinema.vo.UserForm;
 import com.example.cinema.vo.ResponseVO;

src/main/java/com/example/cinema/bl/HallServiceImpl.java → src/main/java/com/example/cinema/blImpl/HallServiceImpl.java

@@ -1,5 +1,6 @@
-package com.example.cinema.bl;
+package com.example.cinema.blImpl;
 
+import com.example.cinema.bl.HallService;
 import com.example.cinema.data.HallMapper;
 import com.example.cinema.vo.ResponseVO;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/example/cinema/bl/MovieServiceImpl.java → src/main/java/com/example/cinema/blImpl/MovieServiceImpl.java

@@ -1,5 +1,6 @@
-package com.example.cinema.bl;
+package com.example.cinema.blImpl;
 
+import com.example.cinema.bl.MovieService;
 import com.example.cinema.data.AccountMapper;
 import com.example.cinema.data.MovieLikeMapper;
 import com.example.cinema.data.MovieMapper;

src/main/java/com/example/cinema/bl/ScheduleServiceImpl.java → src/main/java/com/example/cinema/blImpl/ScheduleServiceImpl.java

@@ -1,5 +1,6 @@
-package com.example.cinema.bl;
+package com.example.cinema.blImpl;
 
+import com.example.cinema.bl.ScheduleService;
 import com.example.cinema.data.HallMapper;
 import com.example.cinema.data.MovieMapper;
 import com.example.cinema.data.ScheduleMapper;

src/main/java/com/example/cinema/bl/VIPServiceImpl.java → src/main/java/com/example/cinema/blImpl/VIPServiceImpl.java

@@ -1,5 +1,6 @@
-package com.example.cinema.bl;
+package com.example.cinema.blImpl;
 
+import com.example.cinema.bl.VIPService;
 import com.example.cinema.data.VIPCardMapper;
 import com.example.cinema.vo.VIPCardForm;
 import com.example.cinema.po.VIPCard;

src/main/java/com/example/cinema/controller/AccountController.java

@@ -1,6 +1,6 @@
 package com.example.cinema.controller;
 
-import com.example.cinema.bl.AccountServiceImpl;
+import com.example.cinema.blImpl.AccountServiceImpl;
 import com.example.cinema.config.InterceptorConfiguration;
 import com.example.cinema.vo.UserForm;
 import com.example.cinema.vo.ResponseVO;