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/vo/DryOrderVo.java

old mode 100644
new mode 100755
@@ -163,7 +163,7 @@
    private String warning;

    /**状态**/
    private Map<String, Object> eqp_state;
//    private Map<String, Object> eqp_state;

    /**设备状态**/
    private String eqp_status;
@@ -175,6 +175,10 @@
     */
    private Double reduce;


    /**平均效率**/
    private Double efficAvg;

    /**平均汽耗**/
    private Double steamAvg;