Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/ResMeterMan...

lxw

2023-06-15 af3d7e2885049d98ab37f732f0a6b0e5601a7f7f

 src/main/java/com/whyc/service/BattGroupDataService.java

@@ -115,7 +115,12 @@
            if(stdRes==0){
                data.setEstimatedCap(stdCap);
            }else{
                data.setEstimatedCap(stdRes/br*stdCap);
                float resRate = stdRes/br;
                if(resRate<=0.5f){
                    data.setEstimatedCap(0f);
                }else {
                    data.setEstimatedCap(stdRes / br * stdCap);
                }
            }

        });