Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git i...

LiJun

2018-10-29 ae8238281a5f6b1d8b5045ff85d604eb2ef20a2e

 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;