From 35d8ce570740e18d29469caddf19ec6b85cedcfc Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期三, 31 十月 2018 17:06:14 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java
index d2daeb3..0ec3770 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Batt_enduranceImpl.java
@@ -78,7 +78,7 @@
 			sql+=is_out_standSqlF;
 		}
 		//鎺掑簭鏃堕棿
-		String orderSql=" order by endurance_actual_timelong asc ";
+		String orderSql=" order by endurance_actual_timelong,tb_batt_endurance.deviceid asc ";
 		sql+=orderSql;
 		//鍒嗛〉
 		String limitSql=" limit ?,? ";

--
Gitblit v1.9.1