Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

cloud-socket/src/com/js/kbt/socket/UserHandler.java

@@ -459,7 +459,7 @@ public class UserHandler extends SimpleChannelInboundHandler<String> {
 		SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:");
 		int housTime = openTime.getHours() - 1;
 		openTime.setHours(housTime);
-		String lastOpenTime = sdf1.format(openTime);
+		String lastOpenTime = sdf.format(openTime);
 		Date lastOpenTimeDate = sdf1.parse(lastOpenTime + "59:59");
 		MouldHistoryTimeExample mExp = new MouldHistoryTimeExample();
 		mExp.setOrderByClause("open_time desc limit 1");