From 6d1509ab9e5aa911a6a2cdc2ab5a0887210f0b41 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 12 Jul 2018 16:07:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/mapper/DeviceVersionMapper.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/mapper/DeviceVersionMapper.java b/src/main/java/com/moral/mapper/DeviceVersionMapper.java
index 8dfa431..7b5c78c 100644
--- a/src/main/java/com/moral/mapper/DeviceVersionMapper.java
+++ b/src/main/java/com/moral/mapper/DeviceVersionMapper.java
@@ -3,6 +3,10 @@
import com.moral.common.mapper.BaseMapper;
import com.moral.entity.DeviceVersion;
+import java.util.List;
+
public interface DeviceVersionMapper extends BaseMapper<DeviceVersion> {
- DeviceVersion selectByPrimaryKey(Integer id);
+ public List<DeviceVersion> selectListByOrgId(Integer orgId);
+ // ������������������������������������������
+ public List<DeviceVersion> selectListByMpointId(Integer orgId);
}
\ No newline at end of file
--
Gitblit v1.8.0