From b3f05e837ef014861c1149ed680afd015440bc19 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期二, 23 十月 2018 11:26:27 +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_devalarm_dataImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_dataImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_dataImpl.java
index 9f25065..5d5a60a 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_dataImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Batt_devalarm_dataImpl.java
@@ -354,7 +354,7 @@
 				" and db_user.tb_user_inf.uid=?) ";
 		baseSql+=stationSql;
 		//鎺掑簭
-		String endSql=" ORDER BY alm_start_time DESC  ";
+		String endSql=" ORDER BY alm_start_time DESC,db_alarm.tb_devalarm_data.dev_id asc  ";
 		//鍒嗛〉
 		String limitSql=" LIMIT ?,? ";
 		sql=baseSql+endSql+limitSql;

--
Gitblit v1.9.1