将码云版本提交至gitlab -- 20241129

zhuguifei

2024-11-29 339515558253d776769dc2e2560bbb4a0450c989

 jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/DryOrderTrendVo.java

old mode 100644
new mode 100755
@@ -67,7 +67,7 @@

    /**电能消耗*/
    @ApiModelProperty(value = "电能消耗")
    private Double electric;
    private Double watt;


    public DryOrderTrendVo(RealTimeDataVo realTimeDataVo) {
@@ -81,6 +81,8 @@
        this.turn = realTimeDataVo.getTurntime();
        this.totalTime = realTimeDataVo.getTime3();
        this.orderId = realTimeDataVo.getOrderId();
        this.watt = realTimeDataVo.getWatt();
        this.steam = realTimeDataVo.getSteam();
        this.tim = new Date();
    }
}