Merge remote-tracking branch 'origin/master'

mrzcc

2020-02-19 44f9cd5c403584c39c8bb893f69244e4835daab8

 java110-bean/src/main/java/com/java110/vo/api/machineRecord/ApiMachineRecordDataVo.java

@@ -10,6 +10,7 @@
    private String machineId;
    private String name;
    private String openTypeCd;
    private String openTypeName;
    private String tel;
    private String idCard;
    private String recordTypeCd;
@@ -78,4 +79,12 @@
    public void setRecordTypeCd(String recordTypeCd) {
        this.recordTypeCd = recordTypeCd;
    }

    public String getOpenTypeName() {
        return openTypeName;
    }

    public void setOpenTypeName(String openTypeName) {
        this.openTypeName = openTypeName;
    }
}