From 57cb796b40a983afcff66edf967e2a1eb513b870 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 02 Feb 2018 14:19:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/service/MachineActivateService.java | 6 ++++--
1 files changed, 4 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..4312794 100644
--- a/src/main/java/com/moral/service/MachineActivateService.java
+++ b/src/main/java/com/moral/service/MachineActivateService.java
@@ -4,8 +4,10 @@
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);
}
--
Gitblit v1.8.0