From a9d8f80c82234bc7c46f117eae00e75304a4e972 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 16 五月 2024 14:50:46 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/pp/DeviceMaintenanceService.java | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/DeviceMaintenanceService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/DeviceMaintenanceService.java
index cefa4d6..886decd 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/DeviceMaintenanceService.java
+++ b/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;
}
--
Gitblit v1.8.0