Merge remote-tracking branch 'origin/master'

puzhibing

2026-07-08 558e77c748c9b07ae949f95cbdaedbbbfa0c4468

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/util/KsolarUtils.java

@@ -140,7 +140,7 @@
        Double yearAllEnergy2 = getYearAllEnergy(stationIds.get(2));
        Double yearAllEnergy3 = getYearAllEnergy(stationIds.get(3));
        double v = yearAllEnergy + yearAllEnergy1 + yearAllEnergy2 + yearAllEnergy3;
        BigDecimal divide = new BigDecimal(v).multiply(new BigDecimal("0.1404")).divide(new BigDecimal("1000"), 2, RoundingMode.DOWN);
        BigDecimal divide = new BigDecimal(v).multiply(new BigDecimal("0.1564")).divide(new BigDecimal("1000"), 2, RoundingMode.DOWN);
        return divide;
    }