From 357935fb2785dc79f4f47ffa7e1c503bc8cea376 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 16 九月 2022 15:19:50 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into master
---
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/KeypointEquipmentInfoController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/KeypointEquipmentInfoController.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/KeypointEquipmentInfoController.java
index 54629c8..a82e0f9 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/KeypointEquipmentInfoController.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/KeypointEquipmentInfoController.java
@@ -63,7 +63,7 @@
PageUtils.checkCheck(pageQuery);
return this.keypointEquipmentInfoService.queryAll(pageQuery);
}
-
+
/**
* 通过主键查询单条数据
@@ -149,7 +149,7 @@
repairDetail.setRepairEndDate(new Timestamp(new java.util.Date().getTime()));
repairDetail.setRepairPersonDepartmentId(0L);
repairDetail.setRepairMemo("");
- repairDetail.setRepairStatus(0);
+ repairDetail.setRepairStatus((byte)0);
repairDetail.setExceptionInfo("");
repairDetails.add(repairDetail);
infoDto.setRepaireDetailList(repairDetails);
@@ -205,7 +205,7 @@
infoDto.setConnectPersonId(0L);
infoDto.setInputPersonId(0L);
infoDto.setResponsibilityPersonId(0L);
- infoDto.setPartType(0);
+ infoDto.setPartType((byte)0);
infoDto.setCheckCycle("");
infoDto.setEmergencePlanId(0L);
infoDto.setDangerousElement("");
@@ -216,4 +216,4 @@
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.2