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

whychdw

2019-12-03 3a95c5d85ca0405a35abb416c2304fe78d37abb4

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/BattresdataImpl.java

@@ -114,7 +114,7 @@
                r.setTest_curr(rs.getFloat(rs.getColumnIndex("test_curr")));
                r.setMon_num(rs.getFloat(rs.getColumnIndex("mon_num")));
                r.setMon_vol(rs.getFloat(rs.getColumnIndex("mon_vol")));
                r.setMon_tmp(rs.getFloat(rs.getColumnIndex("mon_vol")));
                r.setMon_tmp(rs.getFloat(rs.getColumnIndex("mon_tmp")));
                r.setMon_res(rs.getFloat(rs.getColumnIndex("mon_res")));
                r.setMon_ser(rs.getFloat(rs.getColumnIndex("mon_ser")));
                r.setConn_res(rs.getFloat(rs.getColumnIndex("conn_res")));