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

hdw

2018-10-31 35d8ce570740e18d29469caddf19ec6b85cedcfc

 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 ?,? ";