Merge branch '1.4.4' into dev

wjc

12 小时以前 0287b5d20f7d57f5352248175733b99d5a99959b

 app/src/main/java/com/hdl/photovoltaic/ui/bean/CloudInverterDeviceBean.java

@@ -59,6 +59,25 @@

    private boolean activate;//是否激活设备(true：激活；false：未激活)

    private  boolean popUpgrade;//改设备是否有弹窗升级
    private  boolean subPopUpgrade;//下挂设备是否有弹窗升级

    public boolean isSubPopUpgrade() {
        return subPopUpgrade;
    }

    public void setSubPopUpgrade(boolean subPopUpgrade) {
        this.subPopUpgrade = subPopUpgrade;
    }

    public boolean isPopUpgrade() {
        return popUpgrade;
    }

    public void setPopUpgrade(boolean popUpgrade) {
        this.popUpgrade = popUpgrade;
    }

    public String getWorkStatusDesc() {
        return workStatusDesc==null?"":this.workStatusDesc;
    }