Merge branch 'master' of https://e.coding.net/chuanghaikeji/smartCampus/backend_code

src/main/java/com/template/model/tongji/MeterPage.java

@@ -0,0 +1,43 @@
+package com.template.model.tongji;
+
+import com.template.common.utils.DataBliu;
+
+public class MeterPage {
+
+    public String build;
+    public String meterId;
+    public Double num;
+    public String createTime;
+
+    public String getBuild() {
+        return build;
+    }
+
+    public void setBuild(String build) {
+        this.build = build;
+    }
+
+    public String getMeterId() {
+        return meterId;
+    }
+
+    public void setMeterId(String meterId) {
+        this.meterId = meterId;
+    }
+
+    public Double getNum() {
+        return DataBliu.getTwo(num);
+    }
+
+    public void setNum(Double num) {
+        this.num = num;
+    }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+}

src/main/java/com/template/model/tongji/TjFloat.java

@@ -4,9 +4,18 @@ import com.template.common.utils.DataBliu;
 
 public class TjFloat {
 
+    public String date;
     public String name;
     public Double num;
 
+    public String getDate() {
+        return date;
+    }
+
+    public void setDate(String date) {
+        this.date = date;
+    }
+
     public String getName() {
         return name;
     }