Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

1098226878@qq.com

2021-12-28 745d27feae34022ccb708aba034123e08e4e9e14

 java110-bean/src/main/java/com/java110/vo/api/machine/ApiMachineDataVo.java

old mode 100644
new mode 100755
@@ -20,6 +20,7 @@
    private String locationObjId;
    private String state;
    private String stateName;
    private String typeId;


    private String floorId;
@@ -236,4 +237,12 @@
    public void setHeartbeatTime(String heartbeatTime) {
        this.heartbeatTime = heartbeatTime;
    }

    public String getTypeId() {
        return typeId;
    }

    public void setTypeId(String typeId) {
        this.typeId = typeId;
    }
}