Rose 最新整合
Merge remote-tracking branch 'origin/master'

Conflicts:
	Cinema/.settings/org.eclipse.core.resources.prefs
	Cinema/WebRoot/WEB-INF/classes/c3p0-config.xml
	Cinema/WebRoot/WEB-INF/classes/com/cpp2/dao/MovieDAO.class
	Cinema/WebRoot/WEB-INF/classes/com/cpp2/dao/impl/MovieDAOImpl.class
	Cinema/WebRoot/WEB-INF/classes/com/cpp2/dao/impl/ScheduleDAOImpl.class
	Cinema/WebRoot/WEB-INF/classes/com/cpp2/domain/Schedule.class
	Cinema/WebRoot/WEB-INF/classes/com/cpp2/manager/servlet/MovieServlet.class
	Cinema/WebRoot/WEB-INF/classes/com/cpp2/manager/servlet/UserServlet.class
	Cinema/WebRoot/WEB-INF/classes/com/cpp2/service/impl/BusinessServiceImpl.class
	Cinema/WebRoot/WEB-INF/web.xml
	Cinema/src/c3p0-config.xml
	Cinema/src/com/cpp2/dao/MovieDAO.java
	Cinema/src/com/cpp2/dao/impl/MovieDAOImpl.java
	Cinema/src/com/cpp2/dao/impl/ScheduleDAOImpl.java
	Cinema/src/com/cpp2/domain/Schedule.java
	Cinema/src/com/cpp2/manager/servlet/MovieServlet.java
	Cinema/src/com/cpp2/manager/servlet/UserServlet.java
	Cinema/src/com/cpp2/service/impl/BusinessServiceImpl.java
	鍚庡彴鎻愪氦鏃ュ織.txt

Signed-off-by: Rose <753653287@qq.com>