Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

廖井涛

2024-05-16 a9d8f80c82234bc7c46f117eae00e75304a4e972

 north-glass-erp/src/main/java/com/example/erp/service/pp/DeviceMaintenanceService.java

@@ -66,6 +66,7 @@
    public Map<String, Object> selectMaintenanceSv(Date selectTime1, Date selectTime2) {
        Map<String, Object> map = new HashMap<>();
        map.put("data", deviceMaintenanceMapper.selectMaintenanceMp(selectTime1,selectTime2));
        map.put("process", deviceMaintenanceMapper.selectProcessMp());
        return map;
    }