unique the product
test
代码优化及完善；
入库程序优化；
入库程序修复，日志优化，错误处理
move the dir
mv the dir
Merge branch 'xie'
Conflicts:
	src/org/hdht/sensordata/dao/hib/SensorDataDaoImpl.java
	web/WEB-INF/classes/org/hdht/product/dao/hib/ProductDAOImpl.class
	web/WEB-INF/classes/org/hdht/sensordata/dao/SensorDataDao.class
	web/WEB-INF/classes/org/hdht/sensordata/dao/hib/SensorDataDaoImpl.class
	web/business/product/js/dataRetrieval.js
for commit
修复授权及二级授权
date format
email func