Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf

zhangfeng

2022-09-21 fee66fde68610850d4c8c52df022b9d53a0cd3f7

 equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/EquipmentInfoController.java

@@ -162,7 +162,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);
@@ -223,10 +223,10 @@
        infoDto.setSetPart("");
        infoDto.setProduceTime(new Timestamp(new java.util.Date().getTime()));
        infoDto.setUseEndDay("");
        infoDto.setLifeCycle(0);
        infoDto.setLifeCycle((byte)0);
        infoDto.setUseDate(new Timestamp(new java.util.Date().getTime()));
        infoDto.setRepairStatus(0);
        infoDto.setStopStatus(0);
        infoDto.setRepairStatus((byte)0);
        infoDto.setStopStatus((byte)0);
        infoDto.setPreviousCheckDate(new Timestamp(new java.util.Date().getTime()));
        infoDto.setPreviousTestDate(new Timestamp(new java.util.Date().getTime()));
        infoDto.setPreviousTakecareDate(new Timestamp(new java.util.Date().getTime()));