Merge branch 'master' of http://lanpucloud.cn:1111/r/herb

zhuguifei

2 天以前 a0a030ec98b711e82720be38c6ea9ddf4a07a22b

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

old mode 100644
new mode 100755
@@ -92,5 +92,5 @@

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