Merge branch '1.4.4' into dev

wjc

1 天以前 db937c029a3f9dbaec86cbbc944ebbee3ece13be

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

@@ -49,6 +49,16 @@
    private HouseInfoBean.Location location;//电站地址
    private String localSecret;//所属电站的本地密钥

    public boolean isActivate() {
        return activate;
    }

    public void setActivate(boolean activate) {
        this.activate = activate;
    }

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

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