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

Administrator

2018-09-30 9ddc2aee31b9afc21659b378932a0f46f43071c2

 gx_tieta/src/com/fgkj/dao/impl/BatttestdatastopDAOImpl.java

@@ -490,6 +490,7 @@
                   realCap=(new BatttestdataDAOImpl()).serchRealCap(sdata);

                }

                sdata.setTest_cap((float)realCap);

                sdata.setPercent((float)(realCap/STDAH));

             }

         }

          return list;