From 4371080df058a549cdaf31dddeca6c5fee58e23b Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期二, 10 六月 2025 15:31:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentMaintenancePlanController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentMaintenancePlanController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentMaintenancePlanController.java
index 410cb3d..36bb9ae 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentMaintenancePlanController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentMaintenancePlanController.java
@@ -261,7 +261,7 @@
List<EquipmentMaintenancePlanDetail> equipmentMaintenancePlanDetails = equipmentMaintenancePlanDetailService.selectByMainId(equipmentMaintenancePlan.getId());
for(EquipmentMaintenancePlanDetail equipmentMaintenancePlanDetail:equipmentMaintenancePlanDetails){
MaintenanceStandard maintenanceStandard = maintenanceStandardService.getById(equipmentMaintenancePlanDetail.getStandardId());
- String num = sysIdentityService.getNumByTypeAndLength("DailyMaintenanceOrder",4);
+ String num = sysIdentityService.getNumByTypeAndLength("MaintenanceOrder",4);
DailyMaintenanceOrder dailyMaintenanceOrder = new DailyMaintenanceOrder();
dailyMaintenanceOrder.setNum(num);
dailyMaintenanceOrder.setEquipmentId(maintenanceStandard.getEquipmentId());
@@ -296,7 +296,7 @@
MessageDTO messageDTO = new MessageDTO();
messageDTO.setTitle("鏈夋柊鐨勪繚鍏诲伐鍗�");
messageDTO.setContent(msg);
- messageDTO.setCategory("绯荤粺娑堟伅");
+ messageDTO.setCategory("淇濆吇宸ュ崟");
messageDTO.setFromUser(user.getUsername());
messageDTO.setToUser("admin");
if(equipmentMaintenancePlanDetails.size()!=0){
--
Gitblit v1.9.3