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
@@ -115,6 +115,8 @@
    @ApiModelProperty(value = "故障")
    private String fault;

    private List<String> faultList = new ArrayList<>();

    @ApiModelProperty(value = "明细数据列表")
    private List<DryOrderTrendVo> detailList = new ArrayList<>();
    @ApiModelProperty(value = "明细")
@@ -157,7 +159,31 @@
    /**蒸汽阀状态 0：关闭 1：开启*/
    private Integer state_valve;

    /**报警**/
    private String warning;

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

    /**设备状态**/
    private String eqp_status;

    private String level;

    /**
     * 干燥减少重量
     */
    private Double reduce;


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

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

    /**平均电耗**/
    private Double wattAvg;

    public DryOrderVo(RealTimeDataVo realTimeDataVo) {
        this.id = IdUtil.fastSimpleUUID();