解决冲突

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/LargeScreenImpl.java

@@ -251,9 +251,9 @@ public class LargeScreenImpl {
 
         }
 
-        mapdta.put("RSD", dailyPower.get());
-        mapdta.put("YFD", monthlyPower.get());
-        mapdta.put("NFD", annualPower.get());
+        mapdta.put("RSD", keepFourdecimalPlaces(dailyPower.get()));
+        mapdta.put("YFD", keepFourdecimalPlaces(monthlyPower.get()));
+        mapdta.put("NFD", keepFourdecimalPlaces(annualPower.get()));
 
 
 //        //总和