From 8efcc21de04bd7f7d784dac97e86e76e1a3ab930 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 15 May 2018 10:47:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/moral/service/impl/DeviceServiceImpl.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
index f85a95b..f6b20ef 100644
--- a/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceServiceImpl.java
@@ -418,4 +418,10 @@
 		return deviceMapper.selectByPrimaryKey(id);
 	}
 
+	@Override
+	public List<Device> getDevicesByProfessionId(Map<String, Object> parameters) {
+		
+		return deviceMapper.getDevicesByProfession(parameters);
+	}
+
 }

--
Gitblit v1.8.0