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/MachineDto.java

@@ -39,10 +39,12 @@
    private String roomId;
    private String roomNum;
    private String locationObjName;
    private String direction;//设备方向
    private String directionName;



    private Date createTime;
    private String createTime;

    private String statusCd = "0";

@@ -119,12 +121,11 @@
        this.machineIp = machineIp;
    }


    public Date getCreateTime() {
    public String getCreateTime() {
        return createTime;
    }

    public void setCreateTime(Date createTime) {
    public void setCreateTime(String createTime) {
        this.createTime = createTime;
    }

@@ -256,4 +257,20 @@
    public void setLocationObjIds(String[] locationObjIds) {
        this.locationObjIds = locationObjIds;
    }

    public String getDirection() {
        return direction;
    }

    public void setDirection(String direction) {
        this.direction = direction;
    }

    public String getDirectionName() {
        return directionName;
    }

    public void setDirectionName(String directionName) {
        this.directionName = directionName;
    }
}