From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:18:30 +0800
Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.
---
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