Merge branch 'master' into google

wjc

3 天以前 dcdd7495322c36bc41c7d18fa91dc8884bc976ef

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

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

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

    public void setWorkStatusDesc(String workStatusDesc) {
        this.workStatusDesc = workStatusDesc;
    }

    private String workStatusDesc;//工作状态（负载中心设备）

    private boolean ogMaster;//离网逆变器才返回


    public boolean isOgMaster() {
        return ogMaster;
    }