From db0b070e51db46e779b8d2ad1d4d213b712602cd Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 11 Jan 2021 17:04:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master

---
 src/main/java/org/springblade/modules/equipment/controller/EquipmentController.java |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/equipment/controller/EquipmentController.java b/src/main/java/org/springblade/modules/equipment/controller/EquipmentController.java
index 3b0694a..9ac58ec 100644
--- a/src/main/java/org/springblade/modules/equipment/controller/EquipmentController.java
+++ b/src/main/java/org/springblade/modules/equipment/controller/EquipmentController.java
@@ -28,7 +28,6 @@
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.modules.catalog.entitly.catalog;
 import org.springblade.modules.catalog.service.catalogService;
 import org.springblade.modules.deploy.service.IDeployService;
 import org.springblade.modules.equipment.vo.EquipmentVOS;
@@ -42,7 +41,6 @@
 import springfox.documentation.annotations.ApiIgnore;
 
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;

--
Gitblit v1.9.3