From e64197421cf28099935f71f193989a3394d47fe0 Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期一, 17 二月 2020 18:12:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
java110-bean/src/main/java/com/java110/vo/api/machineRecord/ApiMachineRecordDataVo.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/java110-bean/src/main/java/com/java110/vo/api/machineRecord/ApiMachineRecordDataVo.java b/java110-bean/src/main/java/com/java110/vo/api/machineRecord/ApiMachineRecordDataVo.java
index fbcae64..eca83b0 100644
--- a/java110-bean/src/main/java/com/java110/vo/api/machineRecord/ApiMachineRecordDataVo.java
+++ b/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;
+ }
}
--
Gitblit v1.8.0