Merge branch 'master' of http://bore.pub:10439/r/ERP_override

chenlu

2024-08-22 b85a2ab202e1da68ca1e532a783dc0f5685dad3b

 north-glass-erp/src/main/java/com/example/erp/mapper/pp/DeviceMaintenanceMapper.java

@@ -32,4 +32,6 @@
    List<DeviceMaintenance> selectMachineMp();

    List<Map<String,String>> openSelectIdMp(String id);

    Boolean updateMaintenanceMp(Integer id, String deviceName, String type, LocalDateTime faultTime, String faultReason, LocalDateTime maintenanceTime, String maintenanceIllustrate, LocalDateTime stopTime, LocalDateTime startTime, String process, String personnel, String cost);
}