谢利军确认数据导出提交的同步导出
Merge remote-tracking branch 'origin/master'
new
xlj update bug list
update bug 1 to 10
update bup 12
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