Merge branch 'herb' of https://gitee.com/baoshwi/herb into herb

zhuguifei

2024-11-27 86f19c30b243337f1400244f3a0426c13e54a475

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

@@ -92,5 +92,5 @@

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