Merge remote-tracking branch 'origin/develop' into develop

src/main/java/org/rcisoft/business/device/maintenance/entity/BusDevService.java

@@ -21,7 +21,7 @@ public class BusDevService {
   @Id
   private String serId;
   private String serPrincipal;
-  private String devNum;
+  private String devId;
   private Date serTm;
   private String serContent;
   private String note;
@@ -44,16 +44,14 @@ public class BusDevService {
     this.serPrincipal = serPrincipal;
   }
 
-
-  public String getDevNum() {
-    return devNum;
+  public String getDevId() {
+    return devId;
   }
 
-  public void setDevNum(String devNum) {
-    this.devNum = devNum;
+  public void setDevId(String devId) {
+    this.devId = devId;
   }
 
-
   public Date getSerTm() {
     return serTm;
   }

src/main/java/org/rcisoft/business/overview/service/impl/OverViewServiceImpl.java

@@ -360,7 +360,7 @@ public class OverViewServiceImpl implements OverViewService {
                 if (total.compareTo(new BigDecimal(0)) == 0)
                     energyCountMVo.setPercent(total + "%");
                 else
-                    energyCountMVo.setPercent(energyCountMVo.getEnergy().divide(total).multiply(new BigDecimal(100)).setScale(1) + "%");
+                    energyCountMVo.setPercent(energyCountMVo.getEnergy().divide(total, 1, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)) + "%");
             }
         }
         return list;