From 7a52cd14e12e5b1053a26ed5a4799da7a09d4b16 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 24 Jul 2018 11:51:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/entity/adapter/EquDeviceAdapter.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/entity/adapter/EquDeviceAdapter.java b/src/main/java/com/moral/entity/adapter/EquDeviceAdapter.java
index 4482f55..915f511 100644
--- a/src/main/java/com/moral/entity/adapter/EquDeviceAdapter.java
+++ b/src/main/java/com/moral/entity/adapter/EquDeviceAdapter.java
@@ -22,6 +22,7 @@
public void setUid(Integer uid) {
device.setOperateUserId(uid);
}
+ public void setId(Integer id) { device.setId(id); }
public void setDevice_name(String device_name) {
device.setName(device_name);
@@ -47,7 +48,7 @@
device.setMonitorPointId(monitorpoint);
}
- public void setProfessionId(String professionId) {
+ public void setProfessionId(Integer professionId) {
device.setProfessionId(professionId);
}
public Device toDevice(){
--
Gitblit v1.8.0