From 939292b1cfd4fb4f714bb5ae09dbc2220cef06b4 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Sat, 27 Feb 2021 19:10:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java
index a560473..dedecfd 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java
@@ -59,6 +59,11 @@
 	}
 
 	@Override
+	public List<EquipmentVO> listAll() {
+		return baseMapper.listAll();
+	}
+
+	@Override
 	public void updateOne(Equipment equipment) {
 		baseMapper.updateOne(equipment);
 	}

--
Gitblit v1.9.3