From 9b02f67b17b9dcbd798862021ac0a516d1ba69b3 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Fri, 06 Nov 2020 15:37:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/moral/service/MachineActivateService.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/moral/service/MachineActivateService.java b/src/main/java/com/moral/service/MachineActivateService.java
index 4312794..5cc70ac 100644
--- a/src/main/java/com/moral/service/MachineActivateService.java
+++ b/src/main/java/com/moral/service/MachineActivateService.java
@@ -2,6 +2,9 @@
 
 import java.util.Map;
 
+import com.moral.common.bean.PageBean;
+import com.moral.entity.MachineActivate;
+
 public interface MachineActivateService {
 
 	Integer checkActivate(String macCpuCode);
@@ -10,4 +13,6 @@
 
 	Integer createMachineActivate(Integer organizationId, String expireDate);
 
+	PageBean<MachineActivate> getMachineActivates(Map<String, Object> parameters);
+
 }

--
Gitblit v1.8.0