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/service/DeviceVersionService.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/service/DeviceVersionService.java b/src/main/java/com/moral/service/DeviceVersionService.java
index af8d202..fdd3242 100644
--- a/src/main/java/com/moral/service/DeviceVersionService.java
+++ b/src/main/java/com/moral/service/DeviceVersionService.java
@@ -14,9 +14,15 @@
void versionSensorConfig(Integer deviceVersionId, Integer[] sensorIds);
+ Integer queryMaxVersionNo();
+
+ DeviceVersion queryByVersionNo(int versionNo);
+
List<Integer> getSensorIds(int deviceVersionId);
List<DeviceVersion> queryByOrgId(Integer organizationId);
+ List<DeviceVersion> queryByMpointId(Integer mpointId);
+
DeviceVersion queryVersionById(Integer versionId);
}
--
Gitblit v1.8.0