Merge branch 'refs/heads/master' into herb

baoshiwei

2024-12-11 7c585586e9bea943161676bd9d127e81123891c3

 jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryOrderTrend.java

old mode 100644
new mode 100755
@@ -84,4 +84,13 @@
    @Excel(name = "租户id", width = 15)
    @ApiModelProperty(value = "租户id")
    private Integer tenantId;


    /**蒸汽消耗*/
    @ApiModelProperty(value = "蒸汽消耗")
    private Double steam;

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