基本完成，缺")"
已設定好beans-config.xml可以對Controller注入Service
全annotation版
annotation
123
設定好moviesList
Merge branch 'branch1'

Conflicts:
	WebContent/WEB-INF/mvc-servlet.xml
	WebContent/WEB-INF/web.xml
	src/beans-config.xml
	src/com/movie/controller/MovieQueryController.java
	src/com/movie/dao/MovieQueryDao.java
	src/com/movie/service/MovieQueryService.java
	src/com/movie/vo/MoviesList.java