Merge branch 'dailyReport' into test

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotrydailyreport/vo/IotRyDailyReportRespVO.java

@@ -73,6 +73,14 @@ public class IotRyDailyReportRespVO {
     @ExcelProperty("当月油耗(吨)")
     private BigDecimal monthlyFuel;
 
+    @Schema(description = "当日上油数量(吨)")
+    @ExcelProperty("当日上油数量(吨)")
+    private BigDecimal dailyOilVolume;
+
+    @Schema(description = "柴油剩余数量(吨)")
+    @ExcelProperty("柴油剩余数量(吨)")
+    private BigDecimal remainDieselVolume;
+
     @Schema(description = "生产时间(H)")
     @ExcelProperty("生产时间(H)")
     private BigDecimal productionTime;

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotrydailyreport/vo/IotRyDailyReportSaveReqVO.java

@@ -55,6 +55,12 @@ public class IotRyDailyReportSaveReqVO {
     @Schema(description = "当月油耗(吨)")
     private BigDecimal monthlyFuel;
 
+    @Schema(description = "当日上油数量(吨)")
+    private BigDecimal dailyOilVolume;
+
+    @Schema(description = "柴油剩余数量(吨)")
+    private BigDecimal remainDieselVolume;
+
     @Schema(description = "生产时间(H)")
     private BigDecimal productionTime;
 

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/iotrydailyreport/IotRyDailyReportDO.java

@@ -85,6 +85,14 @@ public class IotRyDailyReportDO extends BaseDO {
      * 当月油耗(吨)
      */
     private BigDecimal monthlyFuel;
+    /**
+     * 当日上油数量(吨)
+     */
+    private BigDecimal dailyOilVolume;
+    /**
+     * 柴油剩余数量(吨)
+     */
+    private BigDecimal remainDieselVolume;
     /**
      * 生产时间(H)
      */