ljj_tijiao
Oz_72_基本做完
Oz_73_完成
Oz_74_完成
Oz_75_提示
Oz_76_修复BUG
Janz_36_留言模块：按商品ID查询留意功能完成
Janz_?

Conflicts:
	Watch/WebRoot/WEB-INF/classes/hibernate.cfg.xml
	Watch/WebRoot/WEB-INF/classes/search/action/HighSearchAction.class
	Watch/WebRoot/WEB-INF/classes/search/action/SearchAction.class
	Watch/WebRoot/WEB-INF/classes/search/search_spring.xml
	Watch/WebRoot/WEB-INF/classes/user/action/RegisterAction.class
	Watch/WebRoot/product/productdetail.jsp
	Watch/WebRoot/search/allwatch.jsp
	Watch/WebRoot/search/boywatch.jsp
	Watch/WebRoot/search/girlwatch.jsp
	Watch/WebRoot/search/lovewatch.jsp
	Watch/src/hibernate.cfg.xml
	Watch/src/search/action/HighSearchAction.java
	Watch/src/search/search_spring.xml
	Watch/src/v_________________________/DataBaseValue.java