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/MachineActivateService.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/moral/service/MachineActivateService.java b/src/main/java/com/moral/service/MachineActivateService.java
index edfe810..5cc70ac 100644
--- a/src/main/java/com/moral/service/MachineActivateService.java
+++ b/src/main/java/com/moral/service/MachineActivateService.java
@@ -2,10 +2,17 @@
import java.util.Map;
+import com.moral.common.bean.PageBean;
+import com.moral.entity.MachineActivate;
+
public interface MachineActivateService {
- Map<String, Object> checkActivate(String macCpuCode);
+ Integer checkActivate(String macCpuCode);
- Map<String, Object> activateMachine(Map<String, Object> parameters);
+ Integer activateMachine(Map<String, Object> parameters);
+
+ Integer createMachineActivate(Integer organizationId, String expireDate);
+
+ PageBean<MachineActivate> getMachineActivates(Map<String, Object> parameters);
}
--
Gitblit v1.8.0