From 81695c67562b55493a2e98263223c5440e28feed Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: Wed, 03 Aug 2022 14:18:58 +0800
Subject: [PATCH] 合并fix
---
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/EquipmentTakecareDetailServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/EquipmentTakecareDetailServiceImpl.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/EquipmentTakecareDetailServiceImpl.java
index 40837cd..bdbd132 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/EquipmentTakecareDetailServiceImpl.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/EquipmentTakecareDetailServiceImpl.java
@@ -30,9 +30,9 @@
@Autowired
private EquipmentTakecareDetailRepository equipmentTakecareDetailRepository;
-
-
-
+
+
+
@Override
public ResultVO queryAll(PageQuery<EquipmentTakecareDetailQueryCriteria> pageQuery) {
Long pageIndex = pageQuery.getPageIndex();
@@ -58,4 +58,4 @@
public List<EquipmentTakecareDetail> queryAll(EquipmentTakecareDetailQueryCriteria criteria) {
return baseMapper.selectList(QueryHelpPlus.getPredicate(EquipmentTakecareDetail.class, criteria));
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.2