Merge branch 'back' of https://github.com/java110/MicroCommunity into back

java110

2020-05-18 3f4948a093237990407b4deaa77506c720dbb859

 java110-bean/src/main/java/com/java110/dto/hardwareAdapation/ApplicationKeyDto.java

@@ -40,6 +40,9 @@
    private String roomId;
    private String roomNum;
    private String bId;
    private String pwd;
    private String typeFlag;
    private String typeFlagName;


    private Date createTime;
@@ -265,4 +268,28 @@
    public void setbId(String bId) {
        this.bId = bId;
    }

    public String getPwd() {
        return pwd;
    }

    public void setPwd(String pwd) {
        this.pwd = pwd;
    }

    public String getTypeFlag() {
        return typeFlag;
    }

    public void setTypeFlag(String typeFlag) {
        this.typeFlag = typeFlag;
    }

    public String getTypeFlagName() {
        return typeFlagName;
    }

    public void setTypeFlagName(String typeFlagName) {
        this.typeFlagName = typeFlagName;
    }
}