Merge branch 'master' of http://121.42.53.174:3000/jiapeng/bridge

src/main/java/com/ekexiu/project/bridge/collect/CollectService.java

@@ -189,7 +189,7 @@ public class CollectService {
					try {
						Writer write = new OutputStreamWriter(fos, ConstData.UTF8);
						PreparedStatement ps = con.prepareStatement(
								"SELECT HVALUE,LVALUE,CID,DIC, CTIME FROM WAVE_DATA_ITME WHERE SEQ =? AND CTIME LIKE ? ORDER BY DIC,CID,CTIME");
								"SELECT HVALUE,LVALUE,CID,DIC, CTIME FROM WAVE_DATA_ITEM WHERE SEQ =? AND CTIME LIKE ? ORDER BY DIC,CID,CTIME");
						try {
							ps.setString(1, srv.getSeq());
							ps.setString(2, yd + "%");