From 49c12cd602a111eb417f3024b9ed965bcb0f69fc Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 11 May 2021 15:54:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java
index fa578b5..2091070 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java
@@ -239,7 +239,6 @@
 		List<DeptVo> deptVos = deptFeignApi.selDeptList();
 		//获取设备数据信息
 		IPage<EquipmentVO> page = equipmentService.selectDeptPages(Condition.getPage(query), equipment, pid, dxtype);
-		System.out.println("page = " + page);
 		//遍历数据
 		for (int j = 0; j < page.getRecords().size(); j++) {
 			if (null!=page.getRecords().get(j).getDeptId()){

--
Gitblit v1.9.3