diff --git a/aucma-report/src/main/java/com/aucma/report/domain/ReportDayDnb.java b/aucma-report/src/main/java/com/aucma/report/domain/ReportDayDnb.java
index 10be648..791dbbf 100644
--- a/aucma-report/src/main/java/com/aucma/report/domain/ReportDayDnb.java
+++ b/aucma-report/src/main/java/com/aucma/report/domain/ReportDayDnb.java
@@ -1,6 +1,8 @@
 package com.aucma.report.domain;
 
+import java.math.BigDecimal;
 import java.util.Date;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -13,183 +15,193 @@ import com.aucma.common.core.domain.BaseEntity;
  * @author ruoyi
  * @date 2023-10-09
  */
-public class ReportDayDnb extends BaseEntity
-        {
-private static final long serialVersionUID=1L;
+public class ReportDayDnb extends BaseEntity {
+    private static final long serialVersionUID = 1L;
 
-    /** 主键标识 */
+    /**
+     * 主键标识
+     */
     private Long objId;
 
-    /** 计量设备编号 */
-            @Excel(name = "计量设备编号")
+    /**
+     * 计量设备编号
+     */
+    @Excel(name = "计量设备编号")
     private String monitorCode;
 
-    /** 仪表值 */
-            @Excel(name = "仪表值")
-    private Long instrumentValue;
-
-    /** 耗量 */
-            @Excel(name = "耗量")
-    private Long expend;
-
-    /** 报表日期 */
-            @Excel(name = "报表日期")
+    /**
+     * 仪表值
+     */
+    @Excel(name = "仪表值")
+    private BigDecimal instrumentValue;
+
+    /**
+     * 耗量
+     */
+    @Excel(name = "耗量")
+    private BigDecimal expend;
+
+    /**
+     * 报表日期
+     */
+    @Excel(name = "报表日期")
     private String reportDate;
 
-    /** 开始时间 */
-            @Excel(name = "开始时间")
+    /**
+     * 开始时间
+     */
+    @Excel(name = "开始时间")
     private String beginTime;
 
-    /** 结束时间 */
-            @Excel(name = "结束时间")
+    /**
+     * 结束时间
+     */
+    @Excel(name = "结束时间")
     private String endTime;
 
-    /** 是否标识 */
-            @Excel(name = "是否标识")
+    /**
+     * 是否标识
+     */
+    @Excel(name = "是否标识")
     private Long isFlag;
 
-    /** 创建人 */
-            @Excel(name = "创建人")
+    /**
+     * 创建人
+     */
+    @Excel(name = "创建人")
     private String createdBy;
 
-    /** 创建时间 */
-            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-            @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date createdTime;
 
-    /** 更新人 */
-            @Excel(name = "更新人")
+    /**
+     * 更新人
+     */
+    @Excel(name = "更新人")
     private String updatedBy;
 
-    /** 更新时间 */
-            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-            @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    /**
+     * 更新时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date updatedTime;
 
-    public void setObjId(Long objId)
-            {
-            this.objId = objId;
-            }
-
-    public Long getObjId()
-            {
-            return objId;
-            }
-    public void setMonitorCode(String monitorCode)
-            {
-            this.monitorCode = monitorCode;
-            }
-
-    public String getMonitorCode()
-            {
-            return monitorCode;
-            }
-    public void setInstrumentValue(Long instrumentValue)
-            {
-            this.instrumentValue = instrumentValue;
-            }
-
-    public Long getInstrumentValue()
-            {
-            return instrumentValue;
-            }
-    public void setExpend(Long expend)
-            {
-            this.expend = expend;
-            }
-
-    public Long getExpend()
-            {
-            return expend;
-            }
-    public void setReportDate(String reportDate)
-            {
-            this.reportDate = reportDate;
-            }
-
-    public String getReportDate()
-            {
-            return reportDate;
-            }
-    public void setBeginTime(String beginTime)
-            {
-            this.beginTime = beginTime;
-            }
-
-    public String getBeginTime()
-            {
-            return beginTime;
-            }
-    public void setEndTime(String endTime)
-            {
-            this.endTime = endTime;
-            }
-
-    public String getEndTime()
-            {
-            return endTime;
-            }
-    public void setIsFlag(Long isFlag)
-            {
-            this.isFlag = isFlag;
-            }
-
-    public Long getIsFlag()
-            {
-            return isFlag;
-            }
-    public void setCreatedBy(String createdBy)
-            {
-            this.createdBy = createdBy;
-            }
-
-    public String getCreatedBy()
-            {
-            return createdBy;
-            }
-    public void setCreatedTime(Date createdTime)
-            {
-            this.createdTime = createdTime;
-            }
-
-    public Date getCreatedTime()
-            {
-            return createdTime;
-            }
-    public void setUpdatedBy(String updatedBy)
-            {
-            this.updatedBy = updatedBy;
-            }
-
-    public String getUpdatedBy()
-            {
-            return updatedBy;
-            }
-    public void setUpdatedTime(Date updatedTime)
-            {
-            this.updatedTime = updatedTime;
-            }
-
-    public Date getUpdatedTime()
-            {
-            return updatedTime;
-            }
-
-@Override
-public String toString(){
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("objId",getObjId())
-            .append("monitorCode",getMonitorCode())
-            .append("instrumentValue",getInstrumentValue())
-            .append("expend",getExpend())
-            .append("reportDate",getReportDate())
-            .append("beginTime",getBeginTime())
-            .append("endTime",getEndTime())
-            .append("isFlag",getIsFlag())
-            .append("createdBy",getCreatedBy())
-            .append("createdTime",getCreatedTime())
-            .append("updatedBy",getUpdatedBy())
-            .append("updatedTime",getUpdatedTime())
-        .toString();
-        }
-        }
+    public void setObjId(Long objId) {
+        this.objId = objId;
+    }
+
+    public Long getObjId() {
+        return objId;
+    }
+
+    public void setMonitorCode(String monitorCode) {
+        this.monitorCode = monitorCode;
+    }
+
+    public String getMonitorCode() {
+        return monitorCode;
+    }
+
+    public void setInstrumentValue(BigDecimal instrumentValue) {
+        this.instrumentValue = instrumentValue;
+    }
+
+    public BigDecimal getInstrumentValue() {
+        return instrumentValue;
+    }
+
+    public void setExpend(BigDecimal expend) {
+        this.expend = expend;
+    }
+
+    public BigDecimal getExpend() {
+        return expend;
+    }
+
+    public void setReportDate(String reportDate) {
+        this.reportDate = reportDate;
+    }
+
+    public String getReportDate() {
+        return reportDate;
+    }
+
+    public void setBeginTime(String beginTime) {
+        this.beginTime = beginTime;
+    }
+
+    public String getBeginTime() {
+        return beginTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setIsFlag(Long isFlag) {
+        this.isFlag = isFlag;
+    }
+
+    public Long getIsFlag() {
+        return isFlag;
+    }
+
+    public void setCreatedBy(String createdBy) {
+        this.createdBy = createdBy;
+    }
+
+    public String getCreatedBy() {
+        return createdBy;
+    }
+
+    public void setCreatedTime(Date createdTime) {
+        this.createdTime = createdTime;
+    }
+
+    public Date getCreatedTime() {
+        return createdTime;
+    }
+
+    public void setUpdatedBy(String updatedBy) {
+        this.updatedBy = updatedBy;
+    }
+
+    public String getUpdatedBy() {
+        return updatedBy;
+    }
+
+    public void setUpdatedTime(Date updatedTime) {
+        this.updatedTime = updatedTime;
+    }
+
+    public Date getUpdatedTime() {
+        return updatedTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("objId", getObjId())
+                .append("monitorCode", getMonitorCode())
+                .append("instrumentValue", getInstrumentValue())
+                .append("expend", getExpend())
+                .append("reportDate", getReportDate())
+                .append("beginTime", getBeginTime())
+                .append("endTime", getEndTime())
+                .append("isFlag", getIsFlag())
+                .append("createdBy", getCreatedBy())
+                .append("createdTime", getCreatedTime())
+                .append("updatedBy", getUpdatedBy())
+                .append("updatedTime", getUpdatedTime())
+                .toString();
+    }
+}
diff --git a/aucma-report/src/main/java/com/aucma/report/domain/ReportPointDnb.java b/aucma-report/src/main/java/com/aucma/report/domain/ReportPointDnb.java
index a639007..4ecfe0e 100644
--- a/aucma-report/src/main/java/com/aucma/report/domain/ReportPointDnb.java
+++ b/aucma-report/src/main/java/com/aucma/report/domain/ReportPointDnb.java
@@ -1,5 +1,6 @@
 package com.aucma.report.domain;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -33,13 +34,13 @@ public class ReportPointDnb extends BaseEntity {
      * 仪表值
      */
     @Excel(name = "仪表值")
-    private Long instrumentValue;
+    private BigDecimal instrumentValue;
 
     /**
      * 耗量
      */
     @Excel(name = "耗量")
-    private Long expend;
+    private BigDecimal expend;
 
     /**
      * 记录时间
@@ -107,19 +108,19 @@ public class ReportPointDnb extends BaseEntity {
         return monitorCode;
     }
 
-    public void setInstrumentValue(Long instrumentValue) {
+    public void setInstrumentValue(BigDecimal instrumentValue) {
         this.instrumentValue = instrumentValue;
     }
 
-    public Long getInstrumentValue() {
+    public BigDecimal getInstrumentValue() {
         return instrumentValue;
     }
 
-    public void setExpend(Long expend) {
+    public void setExpend(BigDecimal expend) {
         this.expend = expend;
     }
 
-    public Long getExpend() {
+    public BigDecimal getExpend() {
         return expend;
     }