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

lxw

2023-01-10 4d152a442bd059f686e548b061cb76a266497d2b

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

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

@@ -115,7 +115,7 @@
            if(stdRes==0){
                data.setEstimatedCap(stdCap);
            }else{
                data.setEstimatedCap(br/stdRes*stdCap);
                data.setEstimatedCap(stdRes/br*stdCap);
            }

        });