From 239a521e95f6d7fcf8cbf18b71c09140e5d0f55f Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 01 Jun 2018 14:58:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/entity/adapter/EquDeviceAdapter.java | 2 +-
1 files changed, 1 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..32a56db 100644
--- a/src/main/java/com/moral/entity/adapter/EquDeviceAdapter.java
+++ b/src/main/java/com/moral/entity/adapter/EquDeviceAdapter.java
@@ -47,7 +47,7 @@
device.setMonitorPointId(monitorpoint);
}
- public void setProfessionId(String professionId) {
+ public void setProfessionId(Integer professionId) {
device.setProfessionId(professionId);
}
public Device toDevice(){
--
Gitblit v1.8.0