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

java110

2021-08-06 b5e47a74ad88c453bf82fb8b870b69ac9d45503f

 java110-bean/src/main/java/com/java110/dto/machine/MachineTranslateDto.java

@@ -94,6 +94,8 @@

    private String remark;

    private String isNow;


    private Date createTime;

@@ -255,4 +257,12 @@
    public void setMachineName(String machineName) {
        this.machineName = machineName;
    }

    public String getIsNow() {
        return isNow;
    }

    public void setIsNow(String isNow) {
        this.isNow = isNow;
    }
}