Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

doum

3 天以前 01a9bdffee1f04561b3b59406cbb7a76474c55f3

 keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/bean/DevConfigBean.java

@@ -12,8 +12,13 @@
    private String linkPhone;
    //设备ID
    private String devId;

    //是否双重验证 0否 1是
    private int doubleAuth;

    //酒精检测开启：0=开启；1=关闭
    private int  alcoholStatus;

    //主键
    private Integer id;
    //备注
@@ -113,4 +118,12 @@
    public void setActivateFileUrl(String activateFileUrl) {
        this.activateFileUrl = activateFileUrl;
    }

    public int getAlcoholStatus() {
        return alcoholStatus;
    }

    public void setAlcoholStatus(int alcoholStatus) {
        this.alcoholStatus = alcoholStatus;
    }
}