Merge branch 'FBS9600' of http://whychdw@118.89.139.230:10101/r/FBS9600App....

whychdw

2019-11-21 1b9f9342ecf66118e29323626dd16e05e9fd83d8

Merge branch 'FBS9600' of http://whychdw@118.89.139.230:10101/r/FBS9600App.git into FBS9600

 platforms/android/app/src/main/java/com/fgkj/impl/BattinfImpl.java

@@ -90,7 +90,7 @@
    //查询库中存在的所有电池组信息
    @Override
    public List searchAll(SQLiteDatabase db) {
        String sql=" select * from tb_battinf where station_install=1 order by battgroupid asc ";
        String sql=" select * from tb_battinf order by battgroupid asc ";
         List list=new ArrayList();
         Cursor rs = db.rawQuery(sql,new String[]{});
         while(rs.moveToNext()){