Merge branch 'xinghong-dev' into 'master'

928255095

2021-09-07 65763d38cf9b6b8067a293d9c99297efea0de3e3

 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;
    }
}